(1)删除调用switchIpType方法的页面相关代码

(2)Stream列表页面展示表单Block,ratelimt有定时任务没有IP时的错位问题
This commit is contained in:
wangxin
2019-04-22 11:13:26 +08:00
parent 34a6cb5ed4
commit fe90fd9935
8 changed files with 8 additions and 24 deletions

View File

@@ -12,6 +12,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.taglibs.standard.functions.Functions;
@@ -153,7 +154,7 @@ public class AppCfgController extends BaseController {
public String ajaxSslSubList(Model model, Long cfgId, Integer index, Integer compileId) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId, compileId);
List<String[]> tabList = new ArrayList();
if (cfg.getIpPortList() != null) {
if (CollectionUtils.isNotEmpty(cfg.getIpPortList())) {
String cfgType = null;
for (IpPortCfg ip : cfg.getIpPortList()) {
if (!ip.getCfgType().equals(cfgType)) {
@@ -162,7 +163,7 @@ public class AppCfgController extends BaseController {
}
}
}
if (cfg.getNtcSubscribeIdCfgList() != null) {
if (CollectionUtils.isNotEmpty(cfg.getNtcSubscribeIdCfgList())) {
String cfgType = null;
for (NtcSubscribeIdCfg ntc : cfg.getNtcSubscribeIdCfgList()) {
if (!ntc.getCfgType().equals(cfgType)) {