From 5f0e78cee519dba8ecd7804c1d8b0e4f72554193 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 3 Dec 2018 16:39:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9proxy=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/online-help/proxy/cache_policy.html | 4 ++-- src/main/webapp/online-help/proxy/control_policy.html | 6 +++--- src/main/webapp/online-help/proxy/intercept_policy.html | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/online-help/proxy/cache_policy.html b/src/main/webapp/online-help/proxy/cache_policy.html index c120732b8..57e840838 100644 --- a/src/main/webapp/online-help/proxy/cache_policy.html +++ b/src/main/webapp/online-help/proxy/cache_policy.html @@ -60,7 +60,7 @@ License: You must have a valid license purchased only from themeforest(the above

- 1.功能简介 + 1.Function Introduction

@@ -95,7 +95,7 @@ License: You must have a valid license purchased only from themeforest(the above

- 2.动作参数 + 2.Action

diff --git a/src/main/webapp/online-help/proxy/control_policy.html b/src/main/webapp/online-help/proxy/control_policy.html index 4785f3998..406bc1f95 100644 --- a/src/main/webapp/online-help/proxy/control_policy.html +++ b/src/main/webapp/online-help/proxy/control_policy.html @@ -60,7 +60,7 @@ License: You must have a valid license purchased only from themeforest(the above

- 1.功能简介 + 1.Function Introduction

@@ -76,7 +76,7 @@ License: You must have a valid license purchased only from themeforest(the above

- 2.执行动作 + 2.Action

@@ -110,7 +110,7 @@ License: You must have a valid license purchased only from themeforest(the above

- 3.业务配置属性 + 3.Attibutes

diff --git a/src/main/webapp/online-help/proxy/intercept_policy.html b/src/main/webapp/online-help/proxy/intercept_policy.html index 03f6184b0..084ee1f6a 100644 --- a/src/main/webapp/online-help/proxy/intercept_policy.html +++ b/src/main/webapp/online-help/proxy/intercept_policy.html @@ -60,7 +60,8 @@ License: You must have a valid license purchased only from themeforest(the above

- 1.功能简介 + 1.Function Introduction +

@@ -73,7 +74,7 @@ License: You must have a valid license purchased only from themeforest(the above

- 2.执行动作 + 2.Action

From d17af176854187415cd39d35cedcb65c95d98655 Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 3 Dec 2018 17:42:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E7=9C=8B=E6=8F=90=E7=A4=BA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=202=E3=80=81=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?log=5Ftotal=203=E3=80=81=E4=BF=AE=E5=A4=8D=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BD=AC=E6=88=90=E6=97=A5=E6=9C=9F=E5=9E=8B=E5=8F=8A?= =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BAis=5Fvali?= =?UTF-8?q?d=E4=B8=BA1=E6=88=963=E7=9A=84=E6=95=B0=E6=8D=AE=204=E3=80=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2link=5Fid=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/UserManageController.java | 32 +++++++++++++++---- .../report/NtcLwhhReportController.java | 2 +- .../web/dao/configuration/RequestInfoDao.java | 2 ++ .../web/dao/configuration/RequestInfoDao.xml | 7 ++++ .../configuration/RequestInfoService.java | 5 +++ .../configuration/UserManageService.java | 15 +++------ .../resources/messages/message_en.properties | 5 +-- .../messages/message_zh_CN.properties | 3 +- .../views/cfg/app/appPolicyCfgList.jsp | 4 +-- .../views/cfg/av/contIp/contIpList.jsp | 4 +-- .../views/cfg/av/contUrl/contUrlList.jsp | 4 +-- .../WEB-INF/views/cfg/av/picIp/picIpList.jsp | 4 +-- .../views/cfg/av/picUrl/picUrlList.jsp | 4 +-- .../WEB-INF/views/cfg/av/signSampleList.jsp | 4 +-- .../WEB-INF/views/cfg/av/voip/voipList.jsp | 4 +-- .../WEB-INF/views/cfg/basicprotocol/list.jsp | 4 +-- .../WEB-INF/views/cfg/ddosIpCfgList.jsp | 4 +-- .../views/cfg/encryptedtunnelbehav/list.jsp | 4 +-- .../views/cfg/fileTransfer/ftpList.jsp | 4 +-- .../views/cfg/fileTransfer/p2pList.jsp | 4 +-- .../WEB-INF/views/cfg/ipaddr/ipList.jsp | 4 +-- .../WEB-INF/views/cfg/mail/mailList.jsp | 4 +-- .../views/cfg/maintenance/userManage/list.jsp | 25 +++++++++------ .../WEB-INF/views/cfg/other/bgpList.jsp | 4 +-- .../WEB-INF/views/cfg/other/xmppList.jsp | 4 +-- .../cfg/proxy/control/httpRedirectList.jsp | 4 +-- .../WEB-INF/views/cfg/website/dnsList.jsp | 4 +-- .../WEB-INF/views/cfg/website/httpList.jsp | 4 +-- .../WEB-INF/views/cfg/website/sslList.jsp | 4 +-- .../views/cfg/whitelist/domainList.jsp | 4 +-- .../views/log/manipulation/dkBehaviorList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/appList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 6 +++- .../WEB-INF/views/log/ntc/httpKeyList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 6 +++- .../WEB-INF/views/log/ntc/ipsecList.jsp | 6 +++- .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 6 +++- .../WEB-INF/views/log/ntc/mmAvIpList.jsp | 6 +++- .../WEB-INF/views/log/ntc/mmAvUrlList.jsp | 6 +++- .../views/log/ntc/mmFileDigestList.jsp | 6 +++- .../WEB-INF/views/log/ntc/mmPicIpList.jsp | 6 +++- .../WEB-INF/views/log/ntc/mmPicUrlList.jsp | 6 +++- .../views/log/ntc/mmPornAudioSampleList.jsp | 6 +++- .../views/log/ntc/mmPornVideoSampleList.jsp | 6 +++- .../views/log/ntc/mmSampleAudioList.jsp | 6 +++- .../views/log/ntc/mmSampleFaceList.jsp | 6 +++- .../views/log/ntc/mmSampleLogoList.jsp | 6 +++- .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 6 +++- .../views/log/ntc/mmSampleSpeakerList.jsp | 6 +++- .../views/log/ntc/mmSampleVideoList.jsp | 6 +++- .../views/log/ntc/mmSampleVoipList.jsp | 6 +++- .../views/log/ntc/mmVoipAccountList.jsp | 6 +++- .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 6 +++- .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 6 +++- .../WEB-INF/views/log/ntc/openVpnList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/p2pList.jsp | 6 +++- .../WEB-INF/views/log/ntc/pptpLogList.jsp | 6 +++- .../webapp/WEB-INF/views/log/ntc/sshList.jsp | 6 +++- .../WEB-INF/views/log/ntc/sslLogList.jsp | 6 +++- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 6 +++- .../plugins/tableExport-3.3.13/tableexport.js | 3 +- 66 files changed, 282 insertions(+), 111 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index a664f9f55..ec63728e5 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -10,6 +10,7 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.eclipse.jetty.util.ajax.JSON; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -301,20 +302,37 @@ public class UserManageController extends BaseController{ @ResponseBody @RequestMapping(value = "userInfo") - public List> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){ + public Map getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){ String[] ipArray = serverIp.split(","); List> userManageList=new ArrayList>(); + String message=""; + Map mess=new HashMap(); for(String ip :ipArray){ + Map map=new HashMap(); UserManage user=new UserManage(); IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip); //根据ip调用接口获取数据 - Map map=userManageService.getUser(ip,userName); - if(ipReuseIpCfg!=null ){ - map.put("serverIp", ipReuseIpCfg.getDestIpAddress()); - userManageList.add(map); - } + try{ + String recv=userManageService.getUser(ip,userName); + if (StringUtils.isNotBlank(recv)) { + map=(Map)JSON.parse(recv); + if(ipReuseIpCfg!=null ){ + map.put("serverIp", ipReuseIpCfg.getDestIpAddress()); + userManageList.add(map); + } + } + } catch (Exception e) { + if(message==""){ + message=ip; + }else{ + message+=","+ip; + } + logger.error("查询失败", e); + } } - return userManageList; + mess.put("message", message); + mess.put("user", userManageList); + return mess; } /* @RequestMapping(value = "view") diff --git a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java index 742839279..09b9d092a 100644 --- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java @@ -34,7 +34,7 @@ public class NtcLwhhReportController extends BaseController { @RequestMapping("/ajaxNtcLwhhReport") public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) { List serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId()); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getAllLwhhRequestInfo(); model.addAttribute("requestInfos", requestInfos); if(bean.getServiceId()!=null){ bean.setServices(bean.getServiceId().toString()); diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java index 205854335..3259fb23f 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java @@ -26,6 +26,8 @@ public interface RequestInfoDao extends CrudDao { void delete(@Param("id") Long id); String getRequestTitleById(@Param("id")Long id); + + List findAllLwhhList(); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 875a2d6f4..ad9f2afbf 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -218,6 +218,13 @@ from request_info + + diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java index c922de8f1..e2c27fb67 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -114,6 +114,11 @@ public class RequestInfoService extends BaseService{ RequestInfo requestInfo=new RequestInfo(); return requestInfoDao.findAllList(requestInfo); } + + public List getAllLwhhRequestInfo(){ + return requestInfoDao.findAllLwhhList(); + } + public List showTask(TaskInfo taskInfo) { return taskInfoDao.findList(taskInfo); diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java index 2bfd9c3b5..b3aca6a22 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -194,22 +194,15 @@ public class UserManageService extends BaseService{ } //根据vpn服务器ip获取用户vpn服务器ip信息 - public Map getUser(String serverIp,String userName){ + public String getUser(String serverIp,String userName){ Map params = new HashMap(); params.put("cmd", Constants.NTC_IP_REUSE_USER_GET); params.put("server_ip", serverIp); params.put("user_name", userName); Map map=new HashMap(); - try{ - String url =Constants.IP_REUSE_CALL_CGI_URL; - String recv = ConfigServiceUtil.getCGI(url, params); - if (StringUtils.isNotBlank(recv)) { - map=(Map)JSON.parse(recv); - } - } catch (Exception e) { - logger.error("查询失败", e); - } - return map; + String url =Constants.IP_REUSE_CALL_CGI_URL; + String recv = ConfigServiceUtil.getCGI(url, params); + return recv; } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 253507778..9fafde797 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1018,7 +1018,7 @@ domain_intercepter_ratelimit=Domain Intercept Rate Limit app_built_in_features_config=APP Built-in Features PXY_INTERCEPT_PKT_BIN=Packet Payload certificate=Certificate -do_log=Unstructured Log Option +do_log=Log Option file_strategy=File Strategy file_desc=File Desc content_type=Content Type @@ -1335,4 +1335,5 @@ log_to_cfg=Config address_pool_is_used=Address pool is used and cannot perform this operation! cgi_service_failed=Request CGI server failed available_ip=Available IP -config_sync=Configuration Synchronization \ No newline at end of file +config_sync=Configuration Synchronization +info_failed=Information Acquisition Failure \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index b3088d4bf..7923f5fcc 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1333,4 +1333,5 @@ log_to_cfg=\u914D\u7F6E address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD5\u6267\u884C\u8BE5\u64CD\u4F5C\uFF01 cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25 available_ip=\u53EF\u7528IP\u5730\u5740 -config_sync=\u914D\u7F6E\u540C\u6B65 \ No newline at end of file +config_sync=\u914D\u7F6E\u540C\u6B65 +info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 25d24bc5a..48049f571 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -378,7 +378,7 @@ - <%-- --%> + @@ -446,7 +446,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 75459f4e9..5d3041fca 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -357,7 +357,7 @@ - <%-- --%> + @@ -500,7 +500,7 @@ - <%--
--%> +
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 068286321..e33e926a0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -373,7 +373,7 @@ - <%-- --%> + @@ -421,7 +421,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index c7ae209ab..a703de5dd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -358,7 +358,7 @@ - <%-- --%> + @@ -502,7 +502,7 @@ - <%--
--%> +
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 1cbe481ff..7c3a31cda 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -345,7 +345,7 @@ - <%-- --%> + @@ -419,7 +419,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index 4d2517bb8..ffbe3d1db 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -305,7 +305,7 @@ - <%-- --%> + @@ -416,7 +416,7 @@ - <%--
--%> +
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index e0655254d..b5b1f88a7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -365,7 +365,7 @@ - <%-- --%> + @@ -412,7 +412,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index d8db05b85..4159ea057 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -380,7 +380,7 @@ - <%-- --%> + @@ -439,7 +439,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 33cec2e14..2489c421a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -324,7 +324,7 @@ - <%-- --%> + @@ -383,7 +383,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index 8a7f9a980..693e6c40f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -377,7 +377,7 @@ - <%-- --%> + @@ -434,7 +434,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index f249645aa..851adad36 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -345,7 +345,7 @@ - <%-- --%> + @@ -391,7 +391,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 3d248887e..278924e28 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -359,7 +359,7 @@ - <%-- --%> + @@ -405,7 +405,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index 504cf7923..e764d363c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -378,7 +378,7 @@ - <%-- --%> + @@ -433,7 +433,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 89fc883a1..ef929dfbe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -360,7 +360,7 @@ - <%-- --%> + @@ -407,7 +407,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp index df3a6faba..3e777d5a2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp @@ -67,30 +67,31 @@ /* html+=""; */ html+=""; html+=""; - for(i=0;i"+userName; + html+=""+userName; html+=""; } - html+=""+data[i].serverIp+""; - html+=""+(data[i].Create_on==null?"":data[i].Create_on); + html+=""+user[i].serverIp+""; + html+=""+(user[i].Create_on==null?"":user[i].Create_on); html+=""; - html+=""+(data[i].Updated_on==null?"":data[i].Updated_on); + html+=""+(user[i].Updated_on==null?"":user[i].Updated_on); html+=""; - html+=""+(data[i].Number_of_Logins==null?"":data[i].Number_of_Logins); + html+=""+(user[i].Number_of_Logins==null?"":user[i].Number_of_Logins); html+=""; - html+=""+(data[i].Outgoing_Unicast_Packets==null?"":data[i].Outgoing_Unicast_Packets); + html+=""+(user[i].Outgoing_Unicast_Packets==null?"":user[i].Outgoing_Unicast_Packets); html+=""; - html+=""+(data[i].Outgoing_Unicast_Total_Size==null?"":data[i].Outgoing_Unicast_Total_Size); + html+=""+(user[i].Outgoing_Unicast_Total_Size==null?"":user[i].Outgoing_Unicast_Total_Size); html+=""; /* html+=""+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets); html+=""; html+=""+(data[i].Outgoing_Broadcast_Total_Size==null?"":data[i].Outgoing_Broadcast_Total_Size); html+=""; */ - html+=""+(data[i].Incoming_Unicast_Packets==null?"":data[i].Incoming_Unicast_Packets); + html+=""+(user[i].Incoming_Unicast_Packets==null?"":user[i].Incoming_Unicast_Packets); html+=""; - html+=""+(data[i].Incoming_Unicast_Total_Size==null?"":data[i].Incoming_Unicast_Total_Size); + html+=""+(user[i].Incoming_Unicast_Total_Size==null?"":user[i].Incoming_Unicast_Total_Size); html+=""; /* html+=""+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets); html+=""; @@ -102,6 +103,10 @@ html+=""; html+="
"; top.$.jBox(html,{width: $(document).width()*0.6,height: 480,title:"", buttons:{"":true}}); + if(data.message !=null && data.message !=""){ + var mes=" "+userName+" "+data.message+" "; + top.$.jBox.tip(mes); + } } }); } diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 53ccd29ae..a5947b915 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -359,7 +359,7 @@ - <%-- --%> + @@ -405,7 +405,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index 3ae9afac9..c94599f72 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -334,7 +334,7 @@ - <%-- --%> + @@ -446,7 +446,7 @@ - <%--
--%> +
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index c0872cd72..f0742c74d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -567,7 +567,7 @@ - <%-- --%> + @@ -672,7 +672,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index b35f688b3..c410fa20e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -358,7 +358,7 @@ - <%-- --%> + @@ -409,7 +409,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index 4edaa6a67..0cee80f1d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -515,7 +515,7 @@ - <%-- --%> + @@ -561,7 +561,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 1962c915b..15367cb76 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -356,7 +356,7 @@ - <%-- --%> + @@ -402,7 +402,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 335abf99b..0cc8ed2b7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -337,7 +337,7 @@ - <%-- --%> + @@ -384,7 +384,7 @@ - <%--
--%> +
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 75aedb004..1b173a304 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -340,7 +340,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index 62f4e8206..4f6014cd7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -288,7 +288,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index ad29dd7e9..c6a07b6e2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -294,7 +294,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 6dbe6b528..3018d3940 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -310,7 +310,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index b11215813..648f0dda2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -347,7 +347,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 0655a6a03..c763fb555 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -318,7 +318,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 6da8e0b59..0ab724095 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -342,7 +342,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 91721170e..84d1cc2a7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -382,7 +382,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 716b67a39..ae2410bf1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -290,7 +290,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 35f1c54bd..e61aa6a92 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -252,7 +252,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index f9d53a999..887d8b8cf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -264,7 +264,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index fb1288442..70f549094 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -321,7 +321,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index d7901d132..13e866e93 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -293,7 +293,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 2fb534be0..5ebf15cc3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -289,7 +289,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 1a7e59907..562a0bff4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -333,7 +333,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 3cdeb0e7a..0b55f24d2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -289,7 +289,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index 5d3a93714..b39c8f184 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -288,7 +288,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index e291e0344..5dd5d10dc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -290,7 +290,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 79574662a..0698c34a5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -332,7 +332,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index de827d158..7049fc3a3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -392,7 +392,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index bc9fe5f65..9c177f962 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -332,7 +332,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index daf6f8fc1..1fbae5bc3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -332,7 +332,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 7267767b3..2304b339f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -332,7 +332,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index 6640c1565..13d0fd4cf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -332,7 +332,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 8944e56e3..12b36509d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -333,7 +333,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index 123fcca2e..3bcf1da8c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -335,7 +335,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index 8a2904329..80a82b667 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -294,7 +294,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 3b1330fa5..cc269072e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -338,7 +338,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index 20c4a0825..a929cc7f8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -300,7 +300,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index a85f07740..a700a0a9a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -265,7 +265,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index 85b8aa578..fcf491901 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -298,7 +298,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index 799e6a3eb..95997151f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -257,7 +257,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index 66db839c8..cf93e3df1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -264,7 +264,11 @@ $(document).ready(function(){ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index 0d1daaded..28ec4e91b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -313,7 +313,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index 95a43ccaf..b53cdc096 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -314,7 +314,11 @@ - ${log.linkId } + + + + + diff --git a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js index 50b3984eb..13365f04e 100644 --- a/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js +++ b/src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js @@ -526,8 +526,7 @@ if (!cell.t) { if (types.number.assert(cell.v)) cell.t = 'n'; else if (types.boolean.assert(cell.v)) cell.t = 'b'; - else if (types.date.assert(cell.v)) cell.t = 'd'; - else cell.t = 's'; + else cell.t = 's'; } if (cell.t === 'd') { From bf45608f6adbcd6f18aef91a2e03b2f58e8725ab Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 3 Dec 2018 17:51:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86sql=E6=9F=A5=E8=AF=A2=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/maintenance/UserManageController.java | 2 +- .../com/nis/web/service/configuration/UserManageService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index ec63728e5..e984ec2c1 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -37,7 +37,7 @@ public class UserManageController extends BaseController{ @RequiresPermissions(value={"user:manage:view"}) public String list(Model model,HttpServletRequest request,HttpServletResponse response ,@ModelAttribute("cfg")UserManage entity){ - Page page = userManageService.findPage(new Page(request, response,"r"), entity); + Page page = userManageService.findPage(new Page(request, response,"a"), entity); model.addAttribute("page", page); return "/cfg/maintenance/userManage/list"; } diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java index b3aca6a22..296ef4a81 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -41,7 +41,7 @@ public class UserManageService extends BaseService{ protected UserManageDao userManageDao; public Page findPage(Page page, UserManage entity) { - entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.setPage(page); List list=userManageDao.findList(entity); page.setList(list); From 50e87fb8538e9f7a65befa34cf19ecfb779d1b3f Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 3 Dec 2018 18:31:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3IP=E4=B8=A2=E5=BC=83?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E7=B1=BB=EF=BC=8C=E4=B8=BB=E8=A1=A8=E6=97=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=E4=B8=8D=E6=9F=A5=E8=AF=A2=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigSynchronizationService.java | 21 +++++++++++-------- src/main/resources/service/service_config.xml | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 507a93422..a77c503e7 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -1509,16 +1509,19 @@ public class ConfigSynchronizationService extends BaseService{ List newList = new ArrayList(); if(entity.getServiceId().equals(3)){//ip drop回调类配置用了主表和子表关系 list = configSynchronizationDao.getCfgIndexList(entity); - List compileIds = Lists.newArrayList(); - for(int i=0;i compileIds = Lists.newArrayList(); + for(int i=0;i - + From fdff7a222e3c1e206c417cb31bd00231b41108c1 Mon Sep 17 00:00:00 2001 From: zhangwq Date: Mon, 3 Dec 2018 19:24:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=B1=A0=E3=80=81?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/configuration/IpAddrPoolCfgDao.xml | 3 ++ .../web/dao/configuration/IpMultiplexDao.xml | 3 ++ .../maintenance/ipMultiplexPool/snatlist2.jsp | 33 +++++++---------- .../ipmulitiplex/snatPolicyForm2.jsp | 31 ++++++++-------- .../ipmulitiplex/snatPolicyList2.jsp | 35 ++++++++----------- .../webapp/static/global/scripts/common.js | 2 +- 6 files changed, 50 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml index dd2a81609..1111b97c8 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml @@ -379,6 +379,9 @@ ip_total = #{ipTotal,jdbcType=INTEGER}, + + addr_pool_name = #{addrPoolName,jdbcType=VARCHAR}, + is_valid = #{isValid,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index 2f4972b93..c4cfc7cbb 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -252,6 +252,9 @@ user_type = #{userType,jdbcType=VARCHAR}, + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + addr_pool_id = #{addrPoolId,jdbcType=INTEGER}, diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp index a5856584c..838eaed0d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp @@ -84,7 +84,7 @@ success:function(data,status){ var dataArr = data.candidate_ip; var html = "" - html = "

" + html = "

" html+=""; html+=""; if(dataArr.length == 0){ @@ -179,20 +179,13 @@ -
- - - - - - - + @@ -364,11 +357,11 @@
- - - + + + - + <%-- --%> <%-- --%> @@ -376,7 +369,7 @@ - + <%-- --%> @@ -391,21 +384,21 @@ - + --%> - + --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp index 950d2617e..7249c070c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp @@ -87,7 +87,7 @@ $(function(){
-
+
- - + + - - + <%-- --%> + - + <%-- --%> <%-- --%> - + - + - + @@ -330,13 +323,13 @@ - + --%> - + --%> <%--
${cfg.cfgId } - + ${fns:abbr(cfg.addrPoolName,20)} ${cfg.ipTotal }
+ <%-- - @@ -485,11 +478,11 @@ ${fns:abbr(lableInfo,20)} + <%-- - ${cfg.creatorName } ${cfg.editorName }
+ <%-- - @@ -350,13 +343,13 @@ + <%-- - diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 3d0b28091..79bab30a0 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -96,7 +96,7 @@ $(function(){ top.$.jBox(html,{height:450,width:600,title:" Log Info",showIcon:false,opacity:0.5}); }); //表格中的tooltips鼠标点击复制完整的内容 - $("td>.tooltips").on("click",function(){ + $("td>.tooltips").not(".addrPool").on("click",function(){ //$(this).attr("data-clipboard-action","copy"); $(this).attr("data-clipboard-text",$(this).attr("data-original-title")); var clipboard = new ClipboardJS('td >.tooltips');