diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index a536c558c..2146cf3f7 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -36,6 +36,7 @@ + @@ -44,7 +45,7 @@ ,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id ,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id, r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable - ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.dns_strategy_id + ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.dns_strategy_id,r.do_log @@ -239,7 +240,8 @@ dest_ip_address, cfg_type, cfg_region_code, - dns_strategy_id + dns_strategy_id, + do_log )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, @@ -272,7 +274,8 @@ #{destIpAddress,jdbcType=VARCHAR}, #{cfgType,jdbcType=VARCHAR}, #{cfgRegionCode,jdbcType=INTEGER}, - #{dnsStrategyId,jdbcType=INTEGER} + #{dnsStrategyId,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} ) @@ -369,6 +372,9 @@ dns_strategy_id = #{dnsStrategyId,jdbcType=INTEGER}, + + + do_log = #{doLog,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index 8e4ea49a9..4fc39163f 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -37,6 +37,7 @@ + @@ -64,6 +65,7 @@ + @@ -100,7 +102,7 @@ ,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id ,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id ,r.is_area_effective,r.classify,r.attribute,r.lable - ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id + ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id,r.do_log r.cfg_id,r.cfg_desc @@ -131,7 +133,7 @@ ,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id ,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id ,r.is_area_effective,r.classify,r.attribute,r.lable - ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id + ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.do_log @@ -391,7 +393,8 @@ alt_name, cfg_type, compile_Id, - cfg_region_code + cfg_region_code, + do_log )values ( #{cfgId,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR}, @@ -426,7 +429,8 @@ #{altName,jdbcType=VARCHAR}, #{cfgType,jdbcType=VARCHAR}, #{compileId,jdbcType=INTEGER}, - #{cfgRegionCode,jdbcType=INTEGER} + #{cfgRegionCode,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} ) @@ -454,7 +458,8 @@ issuer, cfg_type, compile_Id, - cfg_region_code + cfg_region_code, + do_log )values ( #{cfgId,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR}, @@ -479,7 +484,8 @@ #{issuer, jdbcType=VARCHAR}, #{cfgType,jdbcType=VARCHAR}, #{compileId,jdbcType=INTEGER}, - #{cfgRegionCode,jdbcType=INTEGER} + #{cfgRegionCode,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} ) @@ -546,6 +552,9 @@ issuer = #{issuer,jdbcType=VARCHAR}, + + + do_log = #{doLog,jdbcType=INTEGER}, @@ -787,6 +796,9 @@ alt_name = #{altName,jdbcType=VARCHAR}, + + do_log = #{doLog,jdbcType=INTEGER}, + diff --git a/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql b/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql index 3ff395954..ce51e1472 100644 --- a/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql +++ b/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql @@ -4,8 +4,17 @@ UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=834 AND UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=835 AND function_id=300; #dnat ip UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=836 AND function_id=304; - #dns strategy UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=65 AND function_id=400; +ALTER TABLE dns_res_strategy ADD COLUMN `do_log` int(11) DEFAULT NULL; +#dns ip +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=64 AND function_id=401; +ALTER TABLE dns_ip_cfg ADD COLUMN `do_log` int(11) DEFAULT NULL; -ALTER TABLE dns_res_strategy ADD COLUMN `do_log` int(11) DEFAULT NULL; \ No newline at end of file +#֤ +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=520 AND function_id=570; +ALTER TABLE pxy_obj_keyring ADD COLUMN `do_log` int(11) DEFAULT NULL; + +#֤ +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=640 AND function_id=571; +ALTER TABLE pxy_obj_trusted_ca_cert ADD COLUMN `do_log` int(11) DEFAULT NULL; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index 8d7ff244e..d1e23bdc7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -363,9 +363,10 @@ function sampleFileValidate(fileType,fileName){ varStatus="satus"> - checked> @@ -382,6 +383,7 @@ function sampleFileValidate(fileType,fileName){ + @@ -453,11 +455,6 @@ function sampleFileValidate(fileType,fileName){ - - - - - <%-- @@ -496,7 +493,38 @@ function sampleFileValidate(fileType,fileName){ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- @@ -521,6 +549,10 @@ function sampleFileValidate(fileType,fileName){ --%> <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%> + + + + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp index 64569672d..16add00e9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp @@ -104,10 +104,11 @@ $(function(){ varStatus="satus"> - checked> @@ -124,6 +125,29 @@ $(function(){ + + + + + + + + + + + + + + + + + + + + + + + <%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index 44eace250..9e24157b2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -210,9 +210,10 @@ function privateFileValidate(){ varStatus="satus"> - checked> @@ -228,6 +229,29 @@ function privateFileValidate(){ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp index ef5666540..3cebfb2ff 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp @@ -118,9 +118,10 @@ function certFileValidate(){ varStatus="satus"> - checked> @@ -136,6 +137,30 @@ function certFileValidate(){ + + + + + + + + + + + + + + + + + + + + + + + +