diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index b57802e5d..1e27a9f50 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -15,6 +15,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.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.DnsIpCfg; @@ -51,9 +52,12 @@ public class DnsIpCfgController extends BaseController { }else{ initFormCondition(model,cfg); } - //获取所有响应策略信息 + /*//获取所有响应策略信息 List resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1); - model.addAttribute("dnsResStrategys", resStrategys); + model.addAttribute("dnsResStrategys", resStrategys);*/ + //查询policyGroup列表,供响应策略选择 2018-07-24 经确定IP欺骗只能选择非0号分组 + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); + model.addAttribute("policyGroups", policyGroups); model.addAttribute("_cfg", cfg); return "/cfg/dnsIpCfgForm"; } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 7a30e0c65..bba6247e1 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -874,13 +874,30 @@ id_not_valid=id of %s %s is invalid num_split_by_comma=%s is a character separated by a comma no_data=Unrelated data must_be=%s value must be %s -REDIRECT_RESPONSE_CODE=Redirect Response Code permanet_redirect=Permanent Redirect temporary_redirect=Temporary Redirect prohibition_access=Prohibition Access not_allowed_method=This method is not allowed to access law_prohibition_access=It is not available for legal reasons -redirect_content=Redirect Content +http_block=HTTP Control +http_reddirect=HTTP Redirect +http_replace=HTTP Replace +http_monit=HTTP Monitoring +http_whitelist=HTTP White List +response_code=Response Code +response_content=Response Content +not_found=Not Found +silent=Silent +redirect_response_code=Redirect Response Code +redirect_url=Redirect URL +replace_zone=Replace Zone +replaced_content=Replaced Content +replace_content=Replace Content +http_req_uri=HTTP Request URI +http_req_header=HTTP Request Header +http_req_body=HTTP Request Content +http_resp_header=HTTP Response Header +http_resp_body=HTTP Response Content #=============region_value,config form title================= #=============userregions=============== userregion1=Customized Region 1 diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 808b0b2e8..893edebef 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -876,13 +876,30 @@ id_not_valid=id\u4E3A%s\u7684%s\u65E0\u6548 num_split_by_comma=%s\u4E3A\u9017\u53F7\u5206\u9694\u7684\u6570\u5B57 no_data=\u65E0\u76F8\u5173\u6570\u636E must_be=%s\u7684\u503C\u5FC5\u987B\u4E3A%s -REDIRECT_RESPONSE_CODE=\u91CD\u5B9A\u5411\u5E94\u7B54\u7801 permanet_redirect=\u6C38\u4E45\u91CD\u5B9A\u5411 temporary_redirect=\u4E34\u65F6\u91CD\u5B9A\u5411 prohibition_access=\u7981\u6B62\u8BBF\u95EE not_allowed_method=\u4E0D\u5141\u8BB8\u6B64\u65B9\u6CD5\u8BBF\u95EE law_prohibition_access=\u7531\u4E8E\u6CD5\u5F8B\u539F\u56E0\u4E0D\u53EF\u7528 -redirect_content=\u91CD\u5B9A\u5411\u5185\u5BB9 +http_block=HTTP\u7BA1\u63A7 +http_reddirect=HTTP\u91CD\u5B9A\u5411 +http_replace=HTTP\u66FF\u6362 +http_monit=HTTP\u76D1\u6D4B +http_whitelist=HTTP\u767D\u540D\u5355 +response_code=\u5E94\u7B54\u7801 +response_content=\u54CD\u5E94\u5185\u5BB9 +not_found=\u4E0D\u5B58\u5728 +silent=\u5173\u95ED +redirect_response_code=\u91CD\u5B9A\u5411\u5E94\u7B54\u7801 +redirect_url=\u91CD\u5B9A\u5411URL +replace_zone=\u66FF\u6362\u533A\u57DF +replaced_content=\u88AB\u66FF\u6362\u5185\u5BB9 +replace_content=\u66FF\u6362\u5185\u5BB9 +http_req_uri=HTTP\u8BF7\u6C42URI +http_req_header=HTTP\u8BF7\u6C42\u5934 +http_req_body=HTTP\u8BF7\u6C42\u5185\u5BB9 +http_resp_header=HTTP\u5E94\u7B54\u5934 +http_resp_body=HTTP\u5E94\u7B54\u5185\u5BB9 #=============region_value,config form title================= #=============userregions=============== userregion1=\u81EA\u5B9A\u4E49\u57DF1 diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp index 7800dc9a9..f28d707ca 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp @@ -73,12 +73,12 @@ $(function(){
- +
- + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index 25418e12f..387a22c51 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -161,15 +161,16 @@ $(function(){
- +
- +
+