From 0018befabc07a7f7981647cadb6c9479ac300483 Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 12 Jan 2019 20:10:25 +0800 Subject: [PATCH] =?UTF-8?q?(1)function=5Fservice=5Fdict=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E5=88=97config=5Fdo=5Flog=EF=BC=8C=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=90=84=E4=B8=AA=E4=B8=9A=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84doLog=E5=80=BC=E7=9A=84=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E3=80=82=20(2)WhiteList,PacketStream?= =?UTF-8?q?=E4=B8=8B=E7=9A=84form=E8=A1=A8=E5=8D=95=E5=8A=A0=E5=85=A5doLog?= =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/FunctionServiceDict.java | 7 + .../nis/web/dao/FunctionServiceDictDao.xml | 3 +- .../function_service_dict_add_do_log.sql | 141 ++++++++++++++++++ src/main/webapp/WEB-INF/include/header.jsp | 1 + .../views/cfg/app/appPolicyCfgForm.jsp | 3 +- .../WEB-INF/views/cfg/basicprotocol/form.jsp | 3 +- .../views/cfg/encryptedtunnelbehav/form.jsp | 1 + .../views/cfg/intercept/interceptForm.jsp | 7 +- .../WEB-INF/views/cfg/ipaddr/ipForm.jsp | 1 + .../WEB-INF/views/cfg/whitelist/ipForm.jsp | 33 ++-- .../webapp/static/global/scripts/doLog.js | 67 +++++++++ 11 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/sql/20190112/function_service_dict_add_do_log.sql create mode 100644 src/main/webapp/static/global/scripts/doLog.js diff --git a/src/main/java/com/nis/domain/FunctionServiceDict.java b/src/main/java/com/nis/domain/FunctionServiceDict.java index 8ae98dc94..821056065 100644 --- a/src/main/java/com/nis/domain/FunctionServiceDict.java +++ b/src/main/java/com/nis/domain/FunctionServiceDict.java @@ -17,9 +17,16 @@ public class FunctionServiceDict extends BaseCfg { private String serviceDesc; private String actionCode; private String regionCode; + private String configDoLog; private Integer isImport; + public String getConfigDoLog() { + return configDoLog; + } + public void setConfigDoLog(String configDoLog) { + this.configDoLog = configDoLog; + } public Integer getIsImport() { return isImport; } diff --git a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml index 34eab36c5..f2fa4a1b3 100644 --- a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml @@ -12,11 +12,12 @@ + - dict_id, function_id, protocol_id, action,action_code, service_id, service_name,service_desc,is_valid,region_code,is_import + dict_id, function_id, protocol_id, action,action_code, service_id, service_name,service_desc,is_valid,region_code,is_import,config_do_log checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index 56a9e1a84..9a3360851 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -241,10 +241,11 @@ var switchRateLimitType=function(){ varStatus="satus">