gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devlop_urldns_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into devlop_urldns_common_group

Browse Source
This commit is contained in:
dongxiaoyan
2019-02-18 10:40:16 +08:00
parent 5b49bf1d80 ded26d9382
commit 9445070693
6 changed files with 617 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
@@ -402,8 +403,12 @@ public class WebsiteController extends BaseController {
public String dnsForm(Model model, String ids, CfgIndexInfo entity) {
if (StringUtils.isNotBlank(ids)) {
entity = websiteCfgService.getDnsCfg(Long.parseLong(ids), null);
entity.setGroupType(12);
entity.setUdFlag(1);
initUpdateFormCondition(model, entity);
} else {
entity.setGroupType(12);
entity.setUdFlag(1);
initFormCondition(model, entity);
}
// 获取所有响应策略信息

5
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.HttpUrlCfg;
@@ -201,6 +202,8 @@ public class WhiteListController extends CommonController {
if (entity.getHttpUrlList().size() == 0) {
entity.getHttpUrlList().add(urlCfg);
}
entity.setGroupType(11);
entity.setUdFlag(1);
initUpdateFormCondition(model, entity);
} else {
HttpUrlCfg urlCfg = new HttpUrlCfg();
@@ -209,6 +212,8 @@ public class WhiteListController extends CommonController {
List<HttpUrlCfg> urlList = new ArrayList<HttpUrlCfg>();
urlList.add(urlCfg);
entity.setHttpUrlList(urlList);
entity.setGroupType(11);
entity.setUdFlag(1);
initFormCondition(model, entity);
}
model.addAttribute("_cfg", entity);