diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index 00246872e..cf3f9708c 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -38,6 +38,7 @@ + r.cfg_id,r.cfg_desc,r.res_group_1_id, @@ -47,7 +48,7 @@ ,r.max_ttl,r.cfg_type,r.action ,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.is_area_effective,r.classify,r.attribute,r.lable,r.do_log ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id @@ -229,7 +230,8 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id max_ttl, cfg_type, compile_Id, - cfg_region_code + cfg_region_code, + do_log )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, @@ -263,7 +265,8 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id #{maxTtl,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR}, #{compileId,jdbcType=INTEGER}, - #{cfgRegionCode,jdbcType=INTEGER} + #{cfgRegionCode,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} ) @@ -358,6 +361,9 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id max_ttl = #{maxTtl,jdbcType=INTEGER}, + + do_log = #{doLog,jdbcType=INTEGER}, + diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 3ee29773d..da61fff6d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1470,4 +1470,4 @@ history=\u5386\u53f2 all_columns_hidden=\u6240\u6709\u7684\u5217\u90fd\u9690\u85cf\u4e86\uff01 no_log=\u4E0D\u8BB0\u5F55 all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7 -framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7 \ No newline at end of file +c_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7 \ No newline at end of file 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 new file mode 100644 index 000000000..3ff395954 --- /dev/null +++ b/src/main/resources/sql/20190113/function_service_dict_add_do_log.sql @@ -0,0 +1,11 @@ +#snatµØÖ·³Ø¹ÜÀí +UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=834 AND function_id=633; +#snat ip +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; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp index f12fd6669..5dde687e4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -228,6 +228,7 @@ $(function(){ + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp index 0cc340f2c..207032874 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp @@ -362,10 +362,11 @@ varStatus="satus">
- <%--
+
@@ -404,7 +405,7 @@
-
--%> +

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp index db03e6c6c..94678d4bf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp @@ -171,9 +171,10 @@