From 645531be8355ed12d52ff5b71254cca7e1ea2152 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 17 Jan 2019 09:59:30 +0600
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87/asn?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/basics/asnGroupList.jsp     | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
index a6f6975f5..fff95f80e 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
@@ -143,7 +143,7 @@
 								
 								<div class="pull-left">
 								
-									<div class="input-group">
+									<%-- <div class="input-group">
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
@@ -157,8 +157,38 @@
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
                                   
-                                    </div> 
-								</div>
+                                    </div>  --%>
+                                    <div class="input-group">
+	                                	<div class="input-group-btn">
+											<span class="form-control" ><spring:message code="organization"/></span>
+	                                   	</div>
+										<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
+	                          		</div>
+									</div>
+									<div class="pull-left">
+									    <div class="input-group">
+		                                	<div class="input-group-btn">
+												<span class="form-control" ><spring:message code="asn_no"/></span>
+		                                   	</div>
+											<input name="asnId" id="asnId" type="text" class="form-control input-medium" value="${cfg.asnId}" />
+		                          		</div>
+									</div>
+									<div class="pull-left">
+									    <div class="input-group">
+		                                	<div class="input-group-btn">
+												<span class="form-control" ><spring:message code="country"/></span>
+		                                   	</div>
+											<input name="country" id="country" type="text" class="form-control input-medium" value="${cfg.country}" />
+		                          		</div>
+									</div>
+									<div class="pull-left">
+									    <div class="input-group">
+		                                	<div class="input-group-btn">
+												<span class="form-control" ><spring:message code="detail"/></span>
+		                                   	</div>
+											<input name="detail" id="detail" type="text" class="form-control input-medium" value="${cfg.detail}" />
+		                          		</div>
+									</div>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
@@ -230,9 +260,9 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.organization"><spring:message code="organization"/></th>
-									<th class="sort-column r.country"><spring:message code="country"/></th>
-									<th class="sort-column r.detail"><spring:message code="detail"/></th>
 									<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
+									<th class="sort-column r.country"><spring:message code="country"/></th>
+									<th class="sort-column r.detail"><spring:message code="detail"/></th>									
 									<th class="sort-column r.is_used"><spring:message code="is_issued"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="creator"/></th>
@@ -248,22 +278,22 @@
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.organization}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.organization,20)}
+											${fns:abbr(cfg.organization,50)}
 										</a>
 									</td>
+									<td>${cfg.asnId}</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.country}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.country,20)}
+											${fns:abbr(cfg.country,50)}
 										</a>
 									</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.detail}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.detail,20)}
+											${fns:abbr(cfg.detail,50)}
 										</a>
 									</td>
-									<td>${cfg.asnId}</td>
 									<td>
 										<c:if test="${cfg.isUsed==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isUsed==1}"><spring:message code="yes"/></c:if>

From 28c3246d11492eab5498cb6f8f819ffd7b5ea33a Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 17 Jan 2019 10:16:24 +0600
Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/login.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 49acd702c..b203598b3 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -79,7 +79,7 @@
 			}
 			
 			.main_right{
-				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/login_06.png");
+				background-image: url("${pageContext.request.contextPath}/static/login/assets/images/login/login_06-K.png");
 				 background-repeat:no-repeat;
 				 background-size: 100% 100%;
 				 max-height: 501px;

From 3e79c2a0fd709d60dd859e83c78643fe87dadc92 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 17 Jan 2019 10:28:26 +0600
Subject: [PATCH 03/18] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E8=A1=A8sql=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=AD=96=E7=95=A5=E5=88=86=E7=BB=84=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E8=87=AA=E5=A2=9E=E8=B5=B7=E5=A7=8B=E5=80=BC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=B8=8E=E6=B8=85=E7=A9=BAasn?=
 =?UTF-8?q?=E5=8F=B7=E5=88=86=E7=BB=84=E8=A1=A8sql=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/truncate_tables.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql
index 32537395e..3e7935cdc 100644
--- a/src/main/resources/sql/truncate_tables.sql
+++ b/src/main/resources/sql/truncate_tables.sql
@@ -1,6 +1,7 @@
 DELETE FROM app_byte_cfg;
 DELETE FROM app_domain_cfg;
 DELETE FROM app_features_index;
+DELETE FROM app_feature_index;
 DELETE FROM app_http_cfg;
 DELETE FROM app_id_cfg;
 DELETE FROM app_ip_cfg;
@@ -65,4 +66,8 @@ DELETE FROM ip_reuse_ip_cfg;
 DELETE FROM ip_reuse_policy_cfg;
 DELETE FROM user_manage;
 #clear vpn
-DELETE FROM service_dict_info  where item_type='5';
\ No newline at end of file
+DELETE FROM service_dict_info  where item_type='5';
+-- 由于DNS策略组的组号也需要大于100，所以策略分组的主键自增从101开始
+ALTER  TABLE  policy_group_info  auto_increment = 101;
+-- 清空asn号分组表
+DELETE FROM asn_group_info;
\ No newline at end of file

From c16f9b16bbc2ae01a890f2ac154467edb710b766 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Thu, 17 Jan 2019 12:43:04 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E6=89=80=E6=9C=89=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=8C=85=E6=80=BB=E9=87=8F=E5=92=8C=E5=AD=97?=
 =?UTF-8?q?=E8=8A=82=E6=80=BB=E9=87=8F=E7=9A=84=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E4=B8=A4=E5=88=97pps=20=E4=B8=8E=20bps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/TrafficIpActiveStatistic.java   | 15 +++++-
 src/main/java/com/nis/util/DateUtils.java     | 14 ++++++
 .../dashboard/DashboardController.java        | 15 +++++-
 .../TrafficStatisticsInfoController.java      | 46 ++++++++++++++++++-
 .../resources/messages/message_en.properties  |  5 +-
 .../resources/messages/message_ru.properties  | 29 ++++++------
 .../messages/message_zh_CN.properties         | 17 +++----
 .../views/dashboard/trafficAppTrendList.jsp   |  8 +++-
 .../views/dashboard/trafficAppTypeList.jsp    |  6 +++
 .../dashboard/trafficHttpStatisticList.jsp    |  6 +++
 .../views/dashboard/trafficIpActiveList.jsp   |  6 +++
 .../dashboard/trafficProtocolTypeList.jsp     |  6 +++
 .../views/dashboard/trafficWebTypeList.jsp    |  6 +++
 13 files changed, 149 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java b/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
index 70e5e593d..6e31c4bb4 100644
--- a/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
+++ b/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
@@ -24,6 +24,8 @@ public class TrafficIpActiveStatistic{
 	String statTime;
 	private String _byte;
 	private String _packet;
+	private String avgByte;
+	private String avgPacket;
 	@ExcelField(title="Byte",sort=51,type=1)
 	public String get_byte() {
 		return BigInteger.valueOf(this.getC2sByteLen()).add(BigInteger.valueOf(this.getS2cByteLen())).toString();
@@ -95,5 +97,16 @@ public class TrafficIpActiveStatistic{
 	public void setS2cByteLen(Long s2cByteLen) {
 		this.s2cByteLen = s2cByteLen;
 	}
-	
+	public String getAvgByte() {
+		return avgByte;
+	}
+	public void setAvgByte(String avgByte) {
+		this.avgByte = avgByte;
+	}
+	public String getAvgPacket() {
+		return avgPacket;
+	}
+	public void setAvgPacket(String avgPacket) {
+		this.avgPacket = avgPacket;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/nis/util/DateUtils.java b/src/main/java/com/nis/util/DateUtils.java
index 2869881e6..af8731e7f 100644
--- a/src/main/java/com/nis/util/DateUtils.java
+++ b/src/main/java/com/nis/util/DateUtils.java
@@ -188,6 +188,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 		long afterTime = after.getTime();
 		return (afterTime - beforeTime) / (1000 * 60 * 60 * 24);
 	}
+	
+	/**
+	 * 鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勭鏁�
+	 * 
+	 * @param before
+	 * @param after
+	 * @return
+	 */
+	public static double getSecondsOfTwoDate(Date before, Date after) {
+		long beforeTime = before.getTime();
+		long afterTime = after.getTime();
+		return (afterTime - beforeTime) / (1000);
+	}
+	
 	/**
 	 * 
 	 * 
diff --git a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
index 62eab0f26..3a3e1226d 100644
--- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
@@ -3,6 +3,7 @@ package com.nis.web.controller.dashboard;
 import java.lang.reflect.Type;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -248,7 +249,7 @@ public class DashboardController extends BaseController{
 	@ResponseBody
 	public List ajaxIpActiveList(String beginDate,String endDate,Integer entranceId){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
-		List list = new ArrayList();
+		List<TrafficIpActiveStatistic> list = new ArrayList<TrafficIpActiveStatistic>();
 		try {
 			String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_IPACTIVE_ONEHOUR;
 			url=urlAddDate(url, beginDate, endDate);
@@ -260,6 +261,16 @@ public class DashboardController extends BaseController{
 			fromJsonList = gson.fromJson(string, new TypeToken<Map<String, Object>>(){}.getType());
 			logger.debug("娲昏穬IP1灏忔椂"+fromJsonList);
 			list = gson.fromJson(fromJsonList.get("data").toString(), new TypeToken<List<TrafficIpActiveStatistic>>() {}.getType()) ;
+			if(list.size()>0) {
+				DecimalFormat lf = new DecimalFormat("0");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				//涓や釜鏃堕棿娈典箣闂寸殑绉掓暟
+				double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
+				for(TrafficIpActiveStatistic data:list) {
+					data.setAvgByte(lf.format(Integer.parseInt(data.get_byte())*8/allSeconds));
+					data.setAvgPacket(lf.format(Integer.parseInt(data.get_packet())/allSeconds));
+				}
+			}
 			Collections.sort(list, new Comparator<TrafficIpActiveStatistic>() {
 
 				@Override
@@ -282,7 +293,7 @@ public class DashboardController extends BaseController{
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("娲昏穬IP鏁版嵁鑾峰彇閿欒"+e);
-			list.add(Maps.newHashMap("error","request_service_failed"));
+			//list.add(Maps.newHashMap("error","request_service_failed"));
 		}
 		return list;
 	}
diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
index 8a1b1f156..a9e08f57d 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -44,6 +44,7 @@ import com.nis.domain.dashboard.TrafficIpActiveStatistic;
 import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DateUtil;
+import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
@@ -301,6 +302,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	@RequestMapping(value="protocolList")
 	@ResponseBody
 	public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST;
@@ -327,6 +329,8 @@ public class TrafficStatisticsInfoController extends BaseController {
 			DecimalFormat lf = new DecimalFormat("0");
 			DecimalFormat df = new DecimalFormat("0.0000000000");
 			List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
+			//涓や釜鏃堕棿娈典箣闂寸殑绉掓暟
+			double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
 			if(!StringUtil.isEmpty(list)){
 				for (Object object : list) {
 					Map m=(Map) object;
@@ -336,6 +340,10 @@ public class TrafficStatisticsInfoController extends BaseController {
 		            m.put("GByte", df.format(m.get("GByte")));
 		            m.put("packets", lf.format(m.get("packets")));
 		            m.put("linkNum", lf.format(m.get("linkNum")));
+		            double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds;
+		            m.put("pps",lf.format(avgPacket));
+		            double avgByte=Double.parseDouble(m.get("GByte").toString())*1024*1024*1024*8/allSeconds;
+		            m.put("bps",lf.format(avgByte));
 		            totalLink+=Long.parseLong( m.get("linkNum").toString());
 		            totalPackets+=Long.parseLong(m.get("packets").toString());
 		         // 鍗忚娌″尮閰嶇殑鍖归厤app鐮佽〃
@@ -407,6 +415,9 @@ public class TrafficStatisticsInfoController extends BaseController {
 			Double totalGByte=0d;
 			DecimalFormat lf = new DecimalFormat("0");
 			DecimalFormat df = new DecimalFormat("0.0000000000");
+			//涓や釜鏃堕棿娈典箣闂寸殑绉掓暟
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
 			if(!StringUtil.isEmpty(list)){
 				for (Object object : list) {
 					Map m=(Map) object;
@@ -417,6 +428,11 @@ public class TrafficStatisticsInfoController extends BaseController {
 		            m.put("linkNum", lf.format(m.get("linkNum")));
 		            totalLink+=Long.parseLong( m.get("linkNum").toString());
 		            totalPackets+=Long.parseLong(m.get("packets").toString());
+		           
+		            double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds;
+			        m.put("pps",lf.format(avgPacket));
+			        double avgByte=Double.parseDouble(m.get("GByte").toString())*1024*1024*1024*8/allSeconds;
+			        m.put("bps",lf.format(avgByte));
 				}
 				for (Object object : list) {
 					Map m=(Map) object;
@@ -485,7 +501,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	@ResponseBody
 	public List ajaxAppTopList(String beginDate,String endDate,Integer appType,Integer entranceId,Integer searchQuota,Model model){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
-		List list = new ArrayList();
+		List<Map> list = new ArrayList<Map>();
 		try {
 			String url=Constants.DASHBOARD_URL+Constants.APPCONN_RECORD_TOP100;
 			URIBuilder uriBuilder = new URIBuilder(url);
@@ -508,7 +524,18 @@ public class TrafficStatisticsInfoController extends BaseController {
 			fromJsonList = gson.fromJson(string, new TypeToken<Map<String, Object>>(){}.getType());
 			logger.debug("app鍒楄〃Top100"+fromJsonList);
 			list = (ArrayList) fromJsonList.get("data");
-			
+			if(list.size()>0) {
+				//涓や釜鏃堕棿娈典箣闂寸殑绉掓暟
+				DecimalFormat dl = new DecimalFormat("0");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
+				for(Map m:list) {
+					double avgPacket=Double.parseDouble(m.get("pktNum").toString())/allSeconds;
+			        m.put("pps",dl.format(avgPacket));
+			        double avgByte=Double.parseDouble(m.get("byteNum").toString())*8/allSeconds;
+			        m.put("bps",dl.format(avgByte));
+				}
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("app鍒楄〃Top100"+e);
@@ -610,6 +637,9 @@ public class TrafficStatisticsInfoController extends BaseController {
 //			Double totalLink=0d;
 			Double totalGbyte=0d;
 			Double totalPackets=0d;
+			//涓や釜鏃堕棿娈典箣闂寸殑绉掓暟
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
 			for (Object object : list) {
 				Map m=(Map)object;
 				Double count=(Double)m.get("byteCount");
@@ -618,6 +648,11 @@ public class TrafficStatisticsInfoController extends BaseController {
 				totalPackets+=(Double)m.get("pktCount");
 				String format = df.format(count/1024/1024/1024);
 				m.put("Gbyte", format);
+				
+				double avgPacket=Double.parseDouble(m.get("pktCount").toString())/allSeconds;
+		        m.put("pps",dl.format(avgPacket));
+		        double avgByte=Double.parseDouble(m.get("byteCount").toString())*8/allSeconds;
+		        m.put("bps",dl.format(avgByte));
 			}
 			List<WebsiteDomainTopic> codeList = appCfgService.getDomainDict(new WebsiteDomainTopic());
 			Map<Long, String> map = new HashMap<Long,String>();
@@ -687,12 +722,19 @@ public class TrafficStatisticsInfoController extends BaseController {
 			Long totalPackets=0l;
 			Double totalGByte=0d;
 			DecimalFormat lf = new DecimalFormat("0");
+			//涓や釜鏃堕棿娈典箣闂寸殑绉掓暟
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
 			if(!StringUtil.isEmpty(list)){
 				for (Object object : list) {
 					Map m=(Map) object;
 					totalLink+=Long.parseLong(lf.format(m.get("linkNum")));
 					totalPackets+=Long.parseLong(lf.format(m.get("packets")));
 					totalGByte+=Double.parseDouble(lf.format(m.get("count")));
+					double avgPacket=Double.parseDouble(m.get("packets").toString())/allSeconds;
+			        m.put("pps",lf.format(avgPacket));
+			        double avgByte=Double.parseDouble(m.get("count").toString())*8/allSeconds;
+			        m.put("bps",lf.format(avgByte));
 					m.remove("domainData");
 					Double value1=0d;
 					if(StringUtil.isBlank(m.get("topicId").toString())){
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 58f6bb21a..f8d59f674 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1361,7 +1361,7 @@ nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
 av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
-asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
+asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.)
 keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration.
 conn_record=Connection Records
 bps=Gbps
@@ -1474,4 +1474,5 @@ framework_log=Meta Log
 block_drop=Block(Drop)
 mail_record=Mail Records
 ssl_record=SSL Records
-http_record=HTTP Records
\ No newline at end of file
+http_record=HTTP Records
+second_bps=bps
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 63a8e577e..0c0c00b84 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -44,6 +44,7 @@ domain_control=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043
 dns_control=DNS
 basic_configuration=\u0411\u0430\u0437\u043e\u0432\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
 Request_from=\u041f\u0438\u0441\u044c\u043c\u0435\u043d\u043d\u044b\u0439 \u043e\u0444\u0438\u0441
+second_bps=bps
 classification_manage=\u041a\u043b\u0430\u0441\u0441\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f
 area_manage=\u0420\u0435\u0433\u0438\u043e\u043d
 feature_scope_manage=\u041e\u0431\u043b\u0430\u0441\u0442\u044c \u043f\u0440\u0438\u0437\u043d\u0430\u043a\u043e\u0432
@@ -342,10 +343,10 @@ expression_type=\u0422\u0438\u043f \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0
 null_expression=\u041d\u0435\u0442 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u044f
 and_expression=&
 match_method=\u041c\u0435\u0442\u043e\u0434\u044b \u0441\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435
-substring_match=\u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435 \u041F\u043E\u0434\u0441\u0442\u0440\u043E\u043A\u043E\u0439
-right_match= \u0421\u0443\u0444\u0444\u0438\u043A\u0441 \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
-left_match=\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
-exactly_match=\u0422\u043E\u0447\u043D\u043E\u0441\u0442\u044C\u044E \u0421\u043E\u0433\u043B\u0430\u0441\u043E\u0432\u0430\u043D\u0438\u0435
+substring_match=\u0421\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435 \u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u043e\u0439
+right_match= \u0421\u0443\u0444\u0444\u0438\u043a\u0441 \u0421\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435
+left_match=\u041f\u0440\u0435\u0444\u0438\u043a\u0441 \u0421\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435
+exactly_match=\u0422\u043e\u0447\u043d\u043e\u0441\u0442\u044c\u044e \u0421\u043e\u0433\u043b\u0430\u0441\u043e\u0432\u0430\u043d\u0438\u0435
 whether_hexbinary=\u041d\u0435\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443 \u0438\u043b\u0438 \u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c, \u0438\u043b\u0438 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 HEX
 hex_binary=HEX \u0444\u043e\u0440\u043c\u0430\u0442
 case_insensitive_nohex=\u041d\u0435\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d \u043a \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443, \u0438 \u043d\u0435 HEX
@@ -1018,7 +1019,7 @@ domain_intercepter_ratelimit=\u041f\u0435\u0440\u0435\u0445\u0432\u0430\u0442 \u
 app_built_in_features_config=\u0412\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0435 \u043f\u0440\u0438\u0437\u043d\u0430\u043a\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
 PXY_INTERCEPT_PKT_BIN=\u041f\u043e\u043b\u0435\u0437\u043d\u0430\u044f \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043f\u0430\u043a\u0435\u0442\u043e\u0432
 certificate=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442
-do_log=\u041D\u0430\u0434\u043E \u043B\u0438 \u0437\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u0436\u0443\u0440\u043D\u0430\u043B
+do_log=\u041d\u0430\u0434\u043e \u043b\u0438 \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b
 file_strategy=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0430 \u0444\u0430\u0439\u043b\u043e\u0432
 file_desc=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u043e\u0432
 content_type=\u0422\u0438\u043f \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f
@@ -1045,7 +1046,7 @@ keyring_name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u0440
 keyring_type=\u0422\u0438\u043f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 private_key_file=\u0424\u0430\u0439\u043b \u0441 \u0437\u0430\u043a\u0440\u044b\u0442\u043e\u043c \u043a\u043b\u044e\u0447\u043e\u043c
 public_key_file=\u0424\u0430\u0439\u043b \u0441 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c \u043a\u043b\u044e\u0447\u043e\u043c
-expire_after=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 \u043f\u043e\u0441\u043b\u0435(\u0414\u043D\u0438)
+expire_after=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 \u043f\u043e\u0441\u043b\u0435(\u0414\u043d\u0438)
 issuer=\u042d\u043c\u0438\u0442\u0435\u043d\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 certificate_subject=\u041f\u0440\u0435\u0434\u043c\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 not_before_time=\u0412\u0440\u0435\u043c\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
@@ -1406,11 +1407,11 @@ APP_TCP_SESSION_BYTE=\u0421\u0435\u0430\u043d\u0441
 ip_count=Uniq-IP
 counnection_count=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439
 asn=ASN
-Unique_num=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u041A\u043B\u0438\u0435\u043D\u0442\u0430 IP
+Unique_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041a\u043b\u0438\u0435\u043d\u0442\u0430 IP
 ip=IP
 country=\u0421\u0442\u0440\u0430\u043d\u0430
 desc=Desc
-unique_num=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u041A\u043B\u0438\u0435\u043D\u0442\u0430 IP
+unique_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041a\u043b\u0438\u0435\u043d\u0442\u0430 IP
 import_limit_is=The maximum import size is
 upload_limit_is=The limitation of file uplaod is
 count=Count
@@ -1472,10 +1473,10 @@ not_exist=not exist
 real_time=Real Time
 history=History
 all_columns_hidden=All columns are hidden!
-no_log=\u041D\u0435\u0442 \u0416\u0443\u0440\u043D\u0430\u043B\u043E\u0432
-all_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B \u0438 \u0416\u0443\u0440\u043D\u0430\u043B-\u0444\u0430\u0439\u043B
-framework_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B
+no_log=\u041d\u0435\u0442 \u0416\u0443\u0440\u043d\u0430\u043b\u043e\u0432
+all_log=\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0416\u0443\u0440\u043d\u0430\u043b \u0438 \u0416\u0443\u0440\u043d\u0430\u043b-\u0444\u0430\u0439\u043b
+framework_log=\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0416\u0443\u0440\u043d\u0430\u043b
 block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435)
-mail_record=\u0417\u0430\u043F\u0438\u0441\u0438 \u041F\u043E\u0447\u0442\u044B
-ssl_record=SSL \u0417\u0430\u043F\u0438\u0441\u0438
-http_record=HTTP \u0417\u0430\u043F\u0438\u0441\u0438
\ No newline at end of file
+mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b
+ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438
+http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438
\ 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 fd0b9b7d8..188458816 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1017,7 +1017,7 @@ domain_intercepter_ratelimit=\u57df\u540d\u62e6\u622a\u9650\u901f
 app_built_in_features_config=APP\u5185\u7f6e\u7279\u5f81\u7ef4\u62a4
 PXY_INTERCEPT_PKT_BIN=\u5305\u8f7d\u8377
 certificate=\u8bc1\u4e66
-do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
+do_log=\u662f\u5426\u8bb0\u5f55\u65e5\u5fd7
 file_strategy=\u6587\u4ef6\u7b56\u7565
 file_desc=\u6587\u4ef6\u63cf\u8ff0\t
 content_type=\u5185\u5bb9\u7c7b\u578b
@@ -1468,10 +1468,11 @@ not_exist=\u4e0d\u5b58\u5728
 real_time=\u5b9e\u65f6
 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
-block_drop=\u5C01\u5835(\u4E22\u5F03)
-mail_record=\u90AE\u4EF6\u6CDB\u6536
-ssl_record=SSL\u6CDB\u6536
-http_record=HTTP\u6CDB\u6536
\ No newline at end of file
+no_log=\u4e0d\u8bb0\u5f55
+all_log=\u8bb0\u5f55\u6240\u6709\u65e5\u5fd7
+framework_log=\u53ea\u8bb0\u5f55\u7ed3\u6784\u5316\u65e5\u5fd7
+block_drop=\u5c01\u5835(\u4e22\u5f03)
+mail_record=\u90ae\u4ef6\u6cdb\u6536
+ssl_record=SSL\u6cdb\u6536
+http_record=HTTP\u6cdb\u6536
+second_bps=bps
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
index 1618849f2..b6f81469e 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
@@ -162,6 +162,8 @@
 									<th><spring:message code="percentage"/> (<spring:message code="packets"/>)</th>
 									<th><spring:message code="bytes"/></th>
 									<th><spring:message code="percentage"/> (<spring:message code="bytes"/>)</th>
+									<th><spring:message code="pps"/></th>
+									<th><spring:message code="second_bps"/></th>
 								</tr>
 							</thead>
 							<tbody id="tableData"></tbody>
@@ -317,6 +319,8 @@
 						html += "<td class='tc'>" + data.pktPercent + " %</td>";
 						html += "<td class='tc'>" + Math.round(data.byteNum*100)/100 + "</td>";
 						html += "<td class='tc'>" + data.bytePercent + " %</td>";
+						html += "<td class='tc'>" + data.pps + "</td>";
+						html += "<td class='tc'>" + data.bps + "</td>";
 						html += "</tr>"
 					if(index==fileDataS.length-1){
 		        		html+="<tr class='tr-total hidden'>"
@@ -327,7 +331,9 @@
 		            	html+= "<td class='tc'>"+"--"+"</td>";
 		            	html+= "<td class='tc'>"+totalbyte+"</td>";
 		            	html+= "<td class='tc'>"+"--"+"</td>";
-		        		html+="</tr>"
+		            	html+= "<td class='tc'>"+"--"+"</td>";
+		            	html+= "<td class='tc'>"+"--"+"</td>";
+		            	html+="</tr>"
 		        	} 
 					}
 					$("#tableData").append(html);
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index dd4b361ec..390483cc6 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -120,6 +120,8 @@
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="packets"/>)</th>
              <th class="tl"><spring:message code="GByte"/></th>
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
+             <th class="tl"><spring:message code="pps"/></th>
+             <th class="tl"><spring:message code="second_bps"/></th>
            </tr>
          </thead>
          <tbody id="tableData"></tbody>
@@ -353,6 +355,8 @@ function htmlData(fileDataS){
             	html+= "<td class='tc'>"+packper+"%"+"</td>";
             	html+= "<td class='tc'>"+Math.round(data.GByte*100)/100+"</td>";
             	html+= "<td class='tc'>"+gbytper+"%"+"</td>";
+            	html+= "<td class='tc'>"+data.pps+"</td>";
+            	html+= "<td class='tc'>"+data.bps+"</td>";
                 html+="</tr>"
            	if(index==fileDataS.length-1){
            		html+="<tr class='tr-total hidden'>"
@@ -364,6 +368,8 @@ function htmlData(fileDataS){
                	html+= "<td class='tc'>"+"100%"+"</td>";
                	html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>";
                	html+= "<td class='tc'>"+"100%"+"</td>";
+               	html+= "<td class='tc'>"+"--"+"</td>";
+               	html+= "<td class='tc'>"+"--"+"</td>";
            		html+="</tr>"
            	}
         	}
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
index c2a569e15..cc8d9505f 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
@@ -82,6 +82,8 @@
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="packets"/>)</th>
              <th class="tl"><spring:message code="GByte"/></th>
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
+             <th class="tl"><spring:message code="pps"/></th>
+             <th class="tl"><spring:message code="second_bps"/></th>
            </tr>
          </thead>
          <tbody id="tableData"></tbody>
@@ -298,6 +300,8 @@ function htmlData(fileDataS){
             	html+= "<td class='tc'>"+(data.packets/data.allPackets*100).toFixed(2)+"%"+"</td>";
             	html+= "<td class='tc'>"+(data.count/1073741824).toFixed(2)+"</td>";
             	html+= "<td class='tc'>"+(data.count/data.allGByte*100).toFixed(2)+"%"+"</td>";
+            	html+= "<td class='tc'>"+data.pps+"</td>";
+            	html+= "<td class='tc'>"+data.bps+"</td>";
                 html+="</tr>"
            	if(index==fileDataS.length-1){
            		html+="<tr class='tr-total hidden'>"
@@ -308,6 +312,8 @@ function htmlData(fileDataS){
                	html+= "<td class='tc'>"+"100%"+"</td>";
                	html+= "<td class='tc'>"+(data.allGByte/1073741824).toFixed(2)+"</td>";
                	html+= "<td class='tc'>"+"100%"+"</td>";
+               	html+= "<td class='tc'>"+"--"+"</td>";
+               	html+= "<td class='tc'>"+"--"+"</td>";
            		html+="</tr>"
            	}  
         	}
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index fa791acf9..8e70efb56 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -100,6 +100,8 @@
 								<th><spring:message code="s2c_pkt_num"/></th>
 								<th><spring:message code="packet"/></th>
 								<th><spring:message code="stat_time"/></th>
+								<th><spring:message code="pps"/></th>
+								<th><spring:message code="second_bps"/></th>
 							</tr>
 						</thead>
 						<tbody id="tbodyData">
@@ -422,6 +424,8 @@ function showIpActiveChart(xData,series){
 		            	html+= "<td class='tc'>"+rs.s2cPktNum+"</td>";
 		            	html+= "<td class='tc'>"+packetNum+"</td>";
 		            	html+= "<td class='tc'>"+rs.statTime+"</td>";
+		            	html+= "<td class='tc'>"+rs.avgPacket+"</td>";
+		            	html+= "<td class='tc'>"+rs.avgByte+"</td>";
 		                html+="</tr>"
 		                
                 	if(i==data.length-1){
@@ -435,6 +439,8 @@ function showIpActiveChart(xData,series){
                     	html+= "<td class='tc'>"+totalc2sPkt+"</td>";
                     	html+= "<td class='tc'>"+totals2cPkt+"</td>";
                     	html+= "<td class='tc'>"+totalpacket+"</td>";
+                		html+= "<td class='tc'>"+"--"+"</td>";
+                		html+= "<td class='tc'>"+"--"+"</td>";
                 		html+= "<td class='tc'>"+"--"+"</td>";
                 		html+="</tr>"
                 	}
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
index 4311e068f..184c8e438 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -107,6 +107,8 @@
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="packets"/>)</th>
              <th class="tl"><spring:message code="GByte"/></th>
              <th class="tl"><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
+             <th class="tl"><spring:message code="pps"/></th>
+             <th class="tl"><spring:message code="second_bps"/></th>
            </tr>
          </thead>
          <tbody id="tableData"></tbody>
@@ -343,6 +345,8 @@ function htmlData(fileDataS){
             	html+= "<td class='tc'>"+packper+"%"+"</td>";
             	html+= "<td class='tc'>"+Math.round(data.GByte*100)/100+"</td>";
             	html+= "<td class='tc'>"+gbytper+"%"+"</td>";
+            	html+= "<td class='tc'>"+data.pps+"</td>";
+            	html+= "<td class='tc'>"+data.bps+"</td>";
                 html+="</tr>"
         	if(index==fileDataS.length-1){
         		html+="<tr class='tr-total hidden'>"
@@ -353,6 +357,8 @@ function htmlData(fileDataS){
             	html+= "<td class='tc'>"+"100%"+"</td>";
             	html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>";
             	html+= "<td class='tc'>"+"100%"+"</td>";
+            	html+= "<td class='tc'>"+"鈥斺��"+"</td>";
+            	html+= "<td class='tc'>"+"鈥斺��"+"</td>";
         		html+="</tr>"
         	}
         	}
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
index ffe66034f..be277e753 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
@@ -150,6 +150,8 @@
 									<th><spring:message code="percentage"/> (<spring:message code="packets"/>)</th>
 									<th><spring:message code="GByte"/></th>
 									<th><spring:message code="percentage"/> (<spring:message code="GByte"/>)</th>
+									<th><spring:message code="pps"/> </th>
+									<th><spring:message code="second_bps"/></th>
 								</tr>
 							</thead>
 							<tbody id="tableData"></tbody>
@@ -398,6 +400,8 @@
 						html += "<td class='tc'>" + packper + " %</td>";
 						html += "<td class='tc'>" + Math.round(data.Gbyte*100)/100 + "</td>";
 						html += "<td class='tc'>" + gbytper + " %</td>";
+						html += "<td class='tc'>" + data.pps + "</td>";
+						html += "<td class='tc'>" + data.bps + "</td>";
 						html += "</tr>"
 					if(index==fileDataS.length-1){
 		        		html+="<tr class='tr-total hidden'>"
@@ -409,6 +413,8 @@
 		            	html+= "<td class='tc'>"+"100%"+"</td>";
 		            	html+= "<td class='tc'>"+parseInt(totalGbyte).toFixed(2)+"</td>";
 		            	html+= "<td class='tc'>"+"100%"+"</td>";
+		            	html+= "<td class='tc'>"+"--"+"</td>";
+		            	html+= "<td class='tc'>"+"--"+"</td>";
 		        		html+="</tr>"
 		        	}
 					}

From e44e8841d3e8b3937ff6ced0b665837281b90b74 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Thu, 17 Jan 2019 12:46:11 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=8E=E7=95=8C=E9=9D=A2=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=9A=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=81Packet=E3=80=81Str?=
 =?UTF-8?q?eam=E3=80=81=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/configuration/AppPolicyCfg.java    |  2 +-
 .../com/nis/domain/configuration/BaseCfg.java |  6 +--
 .../domain/configuration/CfgIndexInfo.java    | 19 +--------
 .../maintenance/DnsIpCfgController.java       |  2 +-
 .../ntc/WhiteListController.java              | 14 ++++---
 .../proxy/InterceptController.java            | 39 ++++++++++++++++++-
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 28 ++++++-------
 .../views/cfg/intercept/interceptList.jsp     | 24 ++++++------
 .../WEB-INF/views/cfg/whitelist/ipList.jsp    | 16 ++++----
 9 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
index ea261c737..c18a26ce0 100644
--- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
@@ -109,7 +109,7 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	@SerializedName("isHexbin")
 	private Integer isHexbin;
 	
-	@ExcelField(title="log_total",sort=31)
+	@ExcelField(title="log_total",sort=43)
 	private Long totalLogs;
 	
 	private List<IpPortCfg> ipPortList;
diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index eda499889..adcbf37bc 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -204,7 +204,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 鏄惁鍖哄煙gk
 	 */
-	@ExcelField(title="whether_area_block",dictType="WHETHER_AREA_BLOCK",sort=40)
+	@ExcelField(title="whether_area_block",dictType="WHETHER_AREA_BLOCK",sort=45)
 	protected Integer isAreaEffective;
 	/**
 	 * 鍒嗙被
@@ -270,9 +270,9 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * do_log灞炴�у湪鐣岄潰锛坉o_log:0涓嶉渶瑕�1璁板綍鎵�鏈夋棩蹇�2鍙褰曠粨鏋勫寲鏃ュ織銆傞粯璁ゆ槸2锛�
 	 */
-	@ExcelField(title="do_log",dictType="DO_LOG",sort=30)
+	@ExcelField(title="do_log",dictType="DO_LOG",sort=40)
 	protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
-	@ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=31)
+	@ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=41)
 	protected Integer doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
 	protected Integer groupId;//浠呯敤浜巆opy灞炴�т娇鐢�
 	protected Integer regionId;//浠呯敤浜巆opy灞炴�т娇鐢�
diff --git a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
index 5ae686d8d..78f45ea8d 100644
--- a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
+++ b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
@@ -86,12 +86,8 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private String country;
 	private String detail;
 	private List<AsnKeywordCfg> asnKeywords;
-	@ExcelField(title="log_total",sort=31)
+	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=20)
-	private Integer isAudit;
-	@ExcelField(title="do_log",dictType="DO_LOG",sort=27)
-	private Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
 
 
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缂撳瓨绛栫暐鐢ㄦ埛鑷畾涔夊煙鍙傛暟
@@ -102,19 +98,6 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 			
 		}
 	}*/
-	
-	public Integer getIsValid() {
-		return isValid;
-	}
-	public void setIsValid(Integer isValid) {
-		this.isValid = isValid;
-	}
-	public Integer getDoLog() {
-		return doLog;
-	}
-	public void setDoLog(Integer doLog) {
-		this.doLog = doLog;
-	}
 	public String getOrganization() {
 		return organization;
 	}
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 f28836828..4b77aebec 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
@@ -218,7 +218,7 @@ public class DnsIpCfgController extends BaseController {
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), DnsIpCfg.class);
-			String cfgIndexInfoNoExport = ",whether_area_block,client_ip,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+			String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 
 			// 鏃堕棿杩囨护
 			if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index 6a8fb2863..fa5615f78 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -500,12 +500,14 @@ public class WhiteListController extends CommonController {
 			for (Integer id : set) {
 				serviceIds.append(id+",");
 			}
-			String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
-			String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
-			//鑾峰彇鏃ュ織鎬婚噺
-			if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
-				List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
-				logTotals.addAll(logs);
+			if(serviceIds.length()>1&&compileIds.length()>1){
+				String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
+				String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
+				//鑾峰彇鏃ュ織鎬婚噺
+				if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
+					List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
+					logTotals.addAll(logs);
+				}
 			}
 			titleList.add(entity.getMenuNameCode());
 			titleList.add("NTC_HTTP_URL");
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
index c3f01a4e5..77c77c68e 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
@@ -3,9 +3,11 @@ package com.nis.web.controller.configuration.proxy;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -273,6 +275,35 @@ public class InterceptController extends CommonController {
 				Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
 				ipLists = page.getList();
 			}
+			//鏃ュ織鎬婚噺
+			List<Map<String,Object>> logTotals=new ArrayList<Map<String,Object>>();
+			StringBuilder compileIds=new StringBuilder(",");//閰嶇疆ids
+			Set<Integer> set=new HashSet<Integer>();//鏈嶅姟ids
+			for (CfgIndexInfo cfg : ipLists) {
+				if(cfg.getIsAudit()!=0){
+					set.add(cfg.getServiceId());
+					compileIds.append(cfg.getCompileId()+",");
+				}else{
+					Map<String,Object> logTotal=new HashMap<String,Object>();
+					logTotal.put("compileId", cfg.getCompileId()+"");
+					logTotal.put("sum",0L);
+					logTotals.add(logTotal);
+				}
+
+			}
+			StringBuilder serviceIds=new StringBuilder(",");
+			for (Integer id : set) {
+				serviceIds.append(id+",");
+			}
+			if(serviceIds.length()>1&&compileIds.length()>1){
+				String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
+				String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
+				//鑾峰彇鏃ュ織鎬婚噺
+				if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
+					List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
+					logTotals.addAll(logs);
+				}
+			}
 			// 鑾峰彇璇佷功淇℃伅
 			List<PxyObjKeyring> certificateList = new ArrayList<PxyObjKeyring>();
 			if (entity.getFunctionId().equals(200)) {
@@ -325,6 +356,12 @@ public class InterceptController extends CommonController {
 			List<BaseStringCfg> httpUrlList = new ArrayList<BaseStringCfg>();
 			List<BaseStringCfg> pktBinList = new ArrayList<BaseStringCfg>();
 			for (CfgIndexInfo cfg : ipLists) {
+				for (Map<String,Object> logTotal : logTotals) {
+					if(cfg.getCompileId().equals(Integer.parseInt((String) logTotal.get("compileId")))){
+						cfg.setTotalLogs((Long)logTotal.get("sum"));
+						break;
+					}
+				}
 				Map<String, List> maps = interceptCfgService.exportIpInfo(cfg);
 				httpUrlList.addAll(maps.get("NTC_HTTP_URL"));
 				ipList.addAll(maps.get("PXY_INTERCEPT_IP"));
@@ -346,7 +383,7 @@ public class InterceptController extends CommonController {
 			httpUrlList = BaseStringCfg.baseHexList(httpUrlList);
 			dataMap.put(entity.getMenuNameCode(), ipLists);
 			if (entity.getFunctionId() == 212) { // IP Payload
-				cfgIndexInfoNoExport = ",do_log,log_total,policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
+				cfgIndexInfoNoExport = ",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
 				titleList.add("PXY_INTERCEPT_IP");
 				titleList.add("PXY_INTERCEPT_PKT_BIN");
 				classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 76718c95a..192f6643f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -331,13 +331,13 @@
 									<th column="cfg_id"   class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
 									<th column="config_describe"   class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
 									<th column="block_type"   class="sort-column r.action"><spring:message code="block_type"/></th>
-									<th column="group"  ><spring:message code="group"/></th>
-									<th column="ip_type"  ><spring:message code="ip_type"/></th>
-									<th column="IP"  ><spring:message code="IP"/></th>
+									<th column="group"  ><spring:message code="group"/></th>									
+									<th column="is_audit"  ><spring:message code="is_audit"/></th>
+									<th column="ip_type"  ><spring:message code="ip_type"/></th>									
 									<%-- <th column="port"  ><spring:message code="port"/></th> --%>
 									<th column="ip_pattern"  ><spring:message code="ip_pattern"/></th>
+									<th column="IP"  ><spring:message code="IP"/></th>
 									<%-- <th column="port_pattern"  ><spring:message code="port_pattern"/></th> --%>
-									<th column="is_audit"  ><spring:message code="is_audit"/></th>
 									<th column="letter"  ><spring:message code="letter"/></th>
 									<th column="classification"  ><spring:message code="classification"/></th>
 									<th column="attribute"  ><spring:message code="attribute"/></th>
@@ -370,13 +370,20 @@
 										<c:if test="${empty cfg.dnsStrategyName}">
 											<spring:message code="default_group"/>
 										</c:if>
+									</td>									
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
 				               			</c:forEach>
-									</td>
-									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
+									</td>									
 									<%-- <td>${cfg.destPort }</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
@@ -388,14 +395,7 @@
 											<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
+									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
 									<td>${cfg.requestName }</td>
 									<td >
 										<c:set var="classify"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 3a3657956..199b383d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -409,14 +409,14 @@
 							    		<th column="userregion1" ><spring:message code="intercept_intensity"/></th>
 							    	</c:if> --%>
 							    	<th column="is_audit" ><spring:message code="is_audit"/></th>
+							    	<th column="do_log" ><spring:message code="do_log"/></th>
+									<th column="log_total" ><spring:message code="log_total"/></th>
 									<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									<th column="do_log" ><spring:message code="do_log"/></th>
-									<th column="log_total" ><spring:message code="log_total"/></th>
+									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>									
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -552,6 +552,14 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.doLog   and indexCfg.action!=64 }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -623,15 +631,7 @@
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq indexCfg.doLog   and indexCfg.action!=64 }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									</td>									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index cac16adfc..da2b28a1e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -374,10 +374,10 @@
 									<th column="attribute"  ><spring:message code="attribute"/></th>
 									<th column="label"  ><spring:message code="label"/></th> --%>
 									
-									<th column="is_audit"  ><spring:message code="is_audit"/></th>
-									<th column="valid_identifier"   class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
+									<th column="is_audit"  ><spring:message code="is_audit"/></th>									
 									<th column="do_log"  ><spring:message code="do_log"/></th>
 									<th column="log_total"  ><spring:message code="log_total"/></th>
+									<th column="valid_identifier"   class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"  ><spring:message code="creator"/></th>
 									<th column="config_time"   class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"  ><spring:message code="editor"/></th>
@@ -476,12 +476,7 @@
 											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
-									</td>
-									<td>
-										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</td>									
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -490,6 +485,11 @@
 										</c:forEach>
 									</td>
 									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

From b77d5444083f67123202193e5bea2dd44a92d9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Thu, 17 Jan 2019 12:50:08 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2->=E7=99=BD=E5=90=8D=E5=8D=95->IP=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95(SQL=E6=96=87=E4=BB=B6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/20190117/add_sys_menu.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/main/resources/sql/20190117/add_sys_menu.sql

diff --git a/src/main/resources/sql/20190117/add_sys_menu.sql b/src/main/resources/sql/20190117/add_sys_menu.sql
new file mode 100644
index 000000000..dc37acbc6
--- /dev/null
+++ b/src/main/resources/sql/20190117/add_sys_menu.sql
@@ -0,0 +1,2 @@
+--鏂板鏃ュ織妫�绱�->鐧藉悕鍗�->IP鐧藉悕鍗�
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1241', '1240', '0,1,152,1240,', 'ip_whitelist', 'IP White List', '1', '/log/ntc/ipWhiteList', '', '', '1', '', '1', '2019-01-16 14:52:55', '1', '2019-01-16 17:27:31', '', '1', NULL, '0', '0', '3');
\ No newline at end of file

From 755160be44c8129463c7e11f0554e023000510ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Thu, 17 Jan 2019 13:36:54 +0800
Subject: [PATCH 07/18] =?UTF-8?q?--=E6=96=B0=E5=A2=9E=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2->=E7=99=BD=E5=90=8D=E5=8D=95->IP=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95(SQL=E6=96=87=E4=BB=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/20190117/add_sys_menu.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/sql/20190117/add_sys_menu.sql b/src/main/resources/sql/20190117/add_sys_menu.sql
index dc37acbc6..dc036d817 100644
--- a/src/main/resources/sql/20190117/add_sys_menu.sql
+++ b/src/main/resources/sql/20190117/add_sys_menu.sql
@@ -1,2 +1,3 @@
 --鏂板鏃ュ織妫�绱�->鐧藉悕鍗�->IP鐧藉悕鍗�
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1240', '152', '0,1,152,', 'whitelist', 'White List', '1', '', '', '', '1', '', '1', '2019-01-16 14:51:10', '1', '2019-01-16 15:31:46', '', '1', NULL, '0', '0', NULL);
 INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1241', '1240', '0,1,152,1240,', 'ip_whitelist', 'IP White List', '1', '/log/ntc/ipWhiteList', '', '', '1', '', '1', '2019-01-16 14:52:55', '1', '2019-01-16 17:27:31', '', '1', NULL, '0', '0', '3');
\ No newline at end of file

From 5f8f109a225f6fc5fadd0cad60826049f18e19d8 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Thu, 17 Jan 2019 14:24:53 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E9=80=9A=E8=81=94=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=90=A5=E5=95=86=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/log/NtcConnRecordLog.java  | 11 +++++++
 .../log/ntc/NtcConnRecordLogController.java   | 11 ++++---
 .../views/log/ntc/connRecordLogList.jsp       | 33 +++++++++++++++----
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java
index a8d1ca1fe..f056a776e 100644
--- a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java
+++ b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java
@@ -28,6 +28,17 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 	@ExcelField(title = "Total Byte", sort = 49)
 	protected String totalByte;
 	
+	protected String ispCode;//杩愯惀鍟�
+	
+
+	
+	public String getIspCode() {
+		return ispCode;
+	}
+
+	public void setIspCode(String ispCode) {
+		this.ispCode = ispCode;
+	}
 
 	public String getTotalPkt() {
 		return totalPkt;
diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
index 705131779..acf3f175b 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
@@ -98,8 +98,9 @@ public class NtcConnRecordLogController extends BaseController {
 			if (StringUtils.isNotBlank(log.getdSubscribeId())) {
 				params.put("searchDSubscribeId", log.getdSubscribeId());
 			}
-			
-
+			if (StringUtils.isNotBlank(log.getIspCode())) {
+				params.put("searchIspCode", log.getIspCode());
+			}
 			model.addAttribute("appList", appList);
 			model.addAttribute("protocolList", protocolList);
 			model.addAttribute("webList", webList);
@@ -240,9 +241,9 @@ public class NtcConnRecordLogController extends BaseController {
 			if (StringUtils.isNotBlank(log.getdSubscribeId())) {
 				params.put("searchDSubscribeId", log.getdSubscribeId());
 			}
-			
-			
-			
+			if (StringUtils.isNotBlank(log.getIspCode())) {
+				params.put("searchIspCode", log.getIspCode());
+			}
 			model.addAttribute("appList", appList);
 			model.addAttribute("protocolList", protocolList);
 			model.addAttribute("webList", webList);
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
index f639f7549..bce69e6a9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
@@ -44,6 +44,16 @@
             $('#appSelect').selectpicker('render');
 		}
         
+        $('#ispSelect').selectpicker();
+        var app = $("#isps").val();		//鍥為�夌殑鏁版嵁
+        if (app !=null && app  !='') {
+            var seasonlist = app.split(",");
+            $('#ispSelect').selectpicker('val',seasonlist);
+            $('#ispSelect').selectpicker('render');
+		}
+        
+        
+        
         $('#protoSelect').selectpicker();
         var proto = $("#protos").val();		//鍥為�夌殑鏁版嵁
         if (proto !=null && proto  !='') {
@@ -127,6 +137,7 @@
 						<input id="apps"  type="hidden" value="${log.appId}"/>
 						<input id="webs"  type="hidden" value="${log.webId}"/>
 						<input id="protos"  type="hidden" value="${log.protoId}"/>
+						<input id="isps"  type="hidden" value="${log.ispCode}"/>
 						<!-- 绛涢�夋寜閽睍寮�鐘舵��-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<sys:tableSort id="orderBy" name="orderBy.
@@ -262,11 +273,22 @@
 							</div> --%>
 							
 							<div class="row">
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='isp'/>锛�</label>
+										<select id="ispSelect" name="ispCode" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
+											<c:forEach items="${fns:getIspDicList('ispCode')}" var="isp" >
+												<option value="${isp.ispKeyCode}"><spring:message code="${isp.ispKeyName}"></spring:message></option>
+											</c:forEach>
+										</select>
+									</div>
+                                </div>
+							
+							
                                 <div class="col-md-2">
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code='APP'/>锛�</label>
 										<select id="appSelect" name="appId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
-											<option value="" disabled="true"><spring:message code="select"/></option>
 											<c:forEach items="${appList}" var="app" >
 												<option value="${app.code}"><spring:message code="${app.item}"></spring:message></option>
 											</c:forEach>
@@ -278,7 +300,6 @@
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code='application_layer_protocol'/>锛�</label>
 										<select id="protoSelect" name="protoId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
-											<option value="" disabled="true"><spring:message code="select"/></option>
 											<c:forEach items="${protocolList}" var="proto" >
 												<option value="${proto.code}"><spring:message code="${proto.item}"></spring:message></option>
 											</c:forEach>
@@ -290,7 +311,6 @@
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code="domain_name"/>锛�</label>
 										<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
-											<option value="" disabled="true"><spring:message code="select"/></option>
 											<c:forEach items="${webList}" var="web" >
 												<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
 											</c:forEach>
@@ -312,15 +332,14 @@
 									</div>
 								</div>
                                 
-                                <div class="col-md-2">
+							</div>
+							<div class="row">
+								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="s_asn"></spring:message>锛�</label>
 										<input name="sAsn" type="text" class="form-control" value="${log.sAsn }"/>
 									</div>
 								</div>
-								
-							</div>
-							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="d_asn"></spring:message>锛�</label>

From a06dd1562d5919ab553f362de1436248d8791b56 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Thu, 17 Jan 2019 16:11:50 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=AD=E4=B8=AA=E5=88=AB=E5=88=97=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=8E=E7=95=8C=E9=9D=A2=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/BaseCfg.java |  4 +--
 .../nis/domain/configuration/BaseIpCfg.java   | 24 +++++++--------
 .../nis/domain/configuration/DdosIpCfg.java   | 24 +++------------
 .../WEB-INF/views/basics/asnIpCfgList.jsp     | 16 +++++-----
 .../maintenance/ipMultiplexPool/snatlist2.jsp | 16 +++++-----
 .../ipmulitiplex/dnatPolicyList2.jsp          | 30 +++++++++----------
 .../ipmulitiplex/snatPolicyList2.jsp          | 16 +++++-----
 7 files changed, 56 insertions(+), 74 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java
index adcbf37bc..14814c0c8 100644
--- a/src/main/java/com/nis/domain/configuration/BaseCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java
@@ -199,7 +199,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 鏉ュ嚱
 	 */
-	@ExcelField(title="letter",sort=58)
+	@ExcelField(title="letter",sort=60)
 	protected String requestName;
 	/**
 	 * 鏄惁鍖哄煙gk
@@ -209,7 +209,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 鍒嗙被
 	 */
-	@ExcelField(title="classification",dictType="type",sort=60)
+	@ExcelField(title="classification",dictType="type",sort=62)
 	protected String classify;
 	/**
 	 * 鎬ц川
diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
index 1f9c56baf..1d543f06b 100644
--- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
@@ -43,24 +43,24 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	 */
 	@Expose
 	@SerializedName("ipType")
-	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
+	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=50)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=51)
 	protected Integer ipPattern; 
-	@ExcelField(title="client_ip",sort=47)
+	@ExcelField(title="client_ip",sort=53)
 	protected String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=46)
+	@ExcelField(title="server_ip",sort=52)
 	protected String destIpAddress;
-	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
+	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=54)
 	protected Integer portPattern;
-	@ExcelField(title="client_port",sort=49)
+	@ExcelField(title="client_port",sort=55)
 	protected String srcPort;
-	@ExcelField(title="server_port",sort=50)
+	@ExcelField(title="server_port",sort=56)
 	protected String destPort; 
 	protected Integer dnsStrategyId; 
-	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=51)
+	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=57)
 	protected Integer irType; 
-	@ExcelField(title="group_name",sort=52)
+	@ExcelField(title="group_name",sort=58)
 	protected String groupName; 
 	
 	private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -75,7 +75,7 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected String organization; //浠呯敤浜巆opy灞炴�т娇鐢�
 	protected String country; //浠呯敤浜巆opy灞炴�т娇鐢�
 	protected String detail; //浠呯敤浜巆opy灞炴�т娇鐢�
-	@ExcelField(title="log_total",sort=31)
+	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
 	
 	public String getOrganization() {
@@ -177,14 +177,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	 */
 	@Expose
 	@SerializedName("direction")
-	@ExcelField(title="direction",dictType="DIRECTION",sort=53)
+	@ExcelField(title="direction",dictType="DIRECTION",sort=58)
 	protected Integer direction ;
 	/**
 	 * 鍗忚
 	 */
 	@Expose
 	@SerializedName("protocol")
-	@ExcelField(title="protocol",dictType="PROTOCOL",sort=54)
+	@ExcelField(title="protocol",dictType="PROTOCOL",sort=59)
 	protected Integer protocol ;
 	/**
 	 * 鍗忚ID
diff --git a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
index c06a292e5..d57e8d577 100644
--- a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java
@@ -23,29 +23,13 @@ public class DdosIpCfg extends BaseIpCfg {
 	 */
 	private static final long serialVersionUID = -5446903784736960824L;
 	private String indexTable="ddos_ip_cfg";
-	@ExcelField(title="antiddos_protocol",sort=41)
+	@ExcelField(title="antiddos_protocol",sort=46)
 	private String antiddosProtocol;//鐩墠鏀寔TCP_SYN, DNS, NTP锛�
-	@ExcelField(title="bps_threadshold",sort=42)
+	@ExcelField(title="bps_threadshold",sort=47)
 	private Long bpsThreadshold;// 鍗矰DoS鏀诲嚮淇濇姢鍔ㄤ綔瑙﹀彂闃堝�硷紝姣忕Bit鏁板拰姣忕鍖呮暟
-	@ExcelField(title="pps_threadshold",sort=43)
+	@ExcelField(title="pps_threadshold",sort=48)
 	private Long ppsThreadshold;
-	@ExcelField(title="log_total",sort=32)
-	private Long totalLogs;	
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=20)
-	private Integer isAudit;
-	
-	public Integer getIsAudit() {
-		return isAudit;
-	}
-	public void setIsAudit(Integer isAudit) {
-		this.isAudit = isAudit;
-	}
-	public Long getTotalLogs() {
-		return totalLogs;
-	}
-	public void setTotalLogs(Long totalLogs) {
-		this.totalLogs = totalLogs;
-	}
+
 	public String getAntiddosProtocol() {
 		return antiddosProtocol;
 	}
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index 35addb20b..04e2fe0fe 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -282,10 +282,10 @@
 									<%-- <th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th> --%>
-									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="label"/></th> --%>									
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -388,12 +388,7 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -412,6 +407,11 @@
 										</c:choose> --%>
 									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
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 e21c08cc8..383896ddf 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
@@ -401,8 +401,7 @@
 									<th column="address_pool"  class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
 									<th column="ip_total"  class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
 									<th column="available_ip_total" ><spring:message code="available_ip_total"/></th>
-									<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>
-									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>									
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
 									<%-- <th column="whether_area_block" ><spring:message code="whether_area_block"/></th> --%>
 									<th column="operation" ><spring:message code="operation"/></th>
@@ -410,6 +409,7 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
+									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -438,12 +438,7 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -524,6 +519,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
index f15562e2f..41a00dace 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
@@ -353,18 +353,17 @@
 									<th column="translated_dest_port" ><spring:message code="translated_dest_port"/></th>
 									<th column="protocol" ><spring:message code="protocol"/></th>
 									<th column="user_type"><spring:message code="user_type"/></th>
-									<th column="user"><spring:message code="user"/></th>
-									<th column="log_total" ><spring:message code="log_total"/></th>
-									
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
+									<th column="user"><spring:message code="user"/></th>																									
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
 									<%-- <th column="do_log" ><spring:message code="do_log"/></th> --%>
+									<th column="log_total" ><spring:message code="log_total"/></th>
+									<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
 									<%-- <th column="whether_area_block" ><spring:message code="whether_area_block"/></th> --%>
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
+									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>									
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -417,16 +416,14 @@
 											</c:if>
 				              			</c:forEach>
 									</td>
-									
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
-									
+																										
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
+									</td> --%>									
 									<%-- <td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
@@ -434,12 +431,7 @@
 													<spring:message code="selective"/>
 												</a>
 										</c:if>
-									</td> --%>
-									<td>
-										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -448,6 +440,8 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 									<td>${indexCfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>
@@ -507,7 +501,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
index 7bf7565c2..7e920966d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
@@ -331,8 +331,7 @@
 									<th column="user"><spring:message code="user"/></th>
 									<%-- <th column="ip"><spring:message code="ip"/></th> --%>
 									<th column="log_total"><spring:message code="log_total"/></th>
-									<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
-									<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>									
 									<th column="is_audit"><spring:message code="is_audit"/></th>
 									<%-- <th column="do_log"><spring:message code="do_log"/></th> --%>
 									<%-- <th column="whether_area_block"><spring:message code="whether_area_block"/></th> --%>
@@ -340,6 +339,7 @@
 									<th column="classification"><spring:message code="classification"/></th>
 									<th column="attribute"><spring:message code="attribute"/></th>
 									<th column="label"><spring:message code="label"/></th>
+									<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"><spring:message code="creator"/></th>
 									<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"><spring:message code="editor"/></th>
@@ -390,12 +390,7 @@
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
-									<td>
-										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -478,6 +473,11 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
+									<td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

From cf7bca577b04b817c9536e0b9a029f18c42d5d75 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Fri, 18 Jan 2019 09:33:23 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E8=A1=8C=E4=B8=BA=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/TrafficStatisticsReportController.java   | 10 +++++-----
 .../webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp  |  2 +-
 .../WEB-INF/views/dashboard/trafficUserBehavior.jsp    |  9 ++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
index 8593cc1be..a1f24ef78 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
@@ -87,11 +87,11 @@ public class TrafficStatisticsReportController extends BaseController {
 				// statTime=DateUtils.getDate()+" 00:00:00"; // 榛樿浠婂ぉ
 				// endTime=DateUtils.getDateTime();
 
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(new Date());
-				endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(cal.getTime());// 鑾峰彇鍒板畬鏁寸殑鏃堕棿
-				cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
-				statTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(cal.getTime());
+				Calendar time = Calendar.getInstance();
+				endTime = DateUtils.formatDateTimeByParm(time.getTime(),"yyyy-MM-dd HH")+":00:00";
+				time.add(Calendar.HOUR_OF_DAY, -1);
+				statTime = DateUtils.formatDateTimeByParm(time.getTime(),"yyyy-MM-dd HH")+":00:00";;
+				
 				bean.setSearchFoundStartTime(statTime);
 				bean.setSearchFoundEndTime(endTime);
 				statTime = URLEncoder.encode(statTime, "UTF-8");
diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index ffde806c0..ae7183090 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -79,7 +79,7 @@ body {
                          <!-- 缃戠粶甯﹀ --><spring:message code="traffic"/>
                         </label>
                         </p>
-                 			<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">c2s <span class="c2sNum">0</span> | s2c <span class="s2cNum">0</span> </p>
+                 			<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">in <span class="c2sNum">0</span> | out <span class="s2cNum">0</span> </p>
                         	<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
                     </div>
                 </div>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
index b207a3362..a2d38a1ae 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
@@ -130,7 +130,6 @@
 		}
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
-// 		$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
 		$("#searchForm").submit();
 		return false;
 	}
@@ -244,7 +243,7 @@
 										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
 	                             	</div>					
 										<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormat('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')"/>
 										</div>
                         		</div>
 								<div class="pull-left">	
@@ -253,14 +252,14 @@
 										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
 	                             	</div>
 											<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormat('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')"/>
 										</div>
                         		</div>
                         		<div class="pull-left accountSearch">
-									<form:input path="account" class="form-control"/>
+									<form:input path="account" class="form-control required"/>
 								</div>
 								<div class="pull-left nasIpSearch">
-									<form:input path="nasIp" class="form-control"/>
+									<form:input path="nasIp" class="form-control required"/>
 								</div>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>

From f55b7b0cc71200753d7a93aae1d4b8e94b831469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 10:08:31 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->IP?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=20=E7=95=8C=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=9F=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/log/ntc/ipWhiteList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipWhiteList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipWhiteList.jsp
index 82517330d..6b5b1b892 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipWhiteList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipWhiteList.jsp
@@ -265,7 +265,7 @@
 								<tr>
 									<td>
 									<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> 鈻� </span><span  style="display: none" id="close${status.index}" > 鈻� </span> --%>
-										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/iplist/ajaxSubList"    compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/whitelist/ajaxIpSubList"    compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

From bb688add0bfca6eda2cbeb0d55407f5327e3cce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 10:14:39 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=97=A5=E5=BF=97->=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=B3=9B=E6=94=B6=20=E7=A7=BB=E9=99=A4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=85=8D=E7=BD=AEID=E5=92=8C=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=E5=88=97,=E5=AF=BC=E5=87=BA=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEID=E5=92=8C=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/ntc/MailRecordLogController.java      |  2 +-
 .../WEB-INF/views/log/ntc/mailRecordList.jsp  | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
index e9f077f8c..2b16197f3 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
@@ -150,7 +150,7 @@ public class MailRecordLogController extends BaseController {
 			} else {
 				hColumns += ",";
 			}
-			String cfgIndexInfoNoExport = "," + hColumns;
+			String cfgIndexInfoNoExport = ",action,cfg_id," + hColumns;
 			noExportMap.put("mail_record", cfgIndexInfoNoExport);
 			dataMap.put("mail_record", list);
 			String timeRange = initLogMap(log, "mail_record");
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
index 43b625b04..e931b1451 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
@@ -237,8 +237,8 @@
 						<thead>
 							<tr>
 								<th><spring:message code="log"/></th>
-								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th>
-								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th>
+<%-- 								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th> --%>
+<%-- 								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th> --%>
 								<th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th>
 								<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
@@ -284,16 +284,16 @@
 <%-- 									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> 鈻� </span><span  style="display: none" id="close${status.index}" > 鈻� </span> --%>
 										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/mail/ajaxMailSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
-									<td>${log.cfgId }</td>
-									<td>
-										<c:set var="actions">${log.action }</c:set>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
-												<c:set var="actions">${dict.itemValue}</c:set>
-											</c:if>
-										</c:forEach>
-										<spring:message code="${actions}"/>
-									</td>
+<%-- 									<td>${log.cfgId }</td> --%>
+<!-- 									<td> -->
+<%-- 										<c:set var="actions">${log.action }</c:set> --%>
+<%-- 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> --%>
+<%-- 											<c:if test="${dict.itemCode eq log.action}"> --%>
+<%-- 												<c:set var="actions">${dict.itemValue}</c:set> --%>
+<%-- 											</c:if> --%>
+<%-- 										</c:forEach> --%>
+<%-- 										<spring:message code="${actions}"/> --%>
+<!-- 									</td> -->
 									<td>${log.foundTime }</td>
 									<td>${log.recvTime }</td>
 									

From 82bbd7667a7b05e84933de654dfc84fca9fd42b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 10:25:06 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=97=A5=E5=BF=97->SSL=E6=B3=9B=E6=94=B6=20?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEID=E5=92=8C=E5=8A=A8=E4=BD=9C=E5=88=97,=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=A7=BB=E9=99=A4=E9=85=8D=E7=BD=AEID=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/ntc/SslRecordLogController.java       |  4 +++-
 .../views/log/ntc/sslRecordLogList.jsp        | 24 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
index f2b9d7b44..45340fb17 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
@@ -60,6 +60,7 @@ public class SslRecordLogController extends BaseController {
 		try {
 			// 璇锋眰鎺ュ彛
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG;
+//			String url="http://192.168.11.198:8080/galaxy-service/service/log/v1/ntcSslRecordLogs";
 			String resJson = HttpClientUtil.getMsg(url, params, request);
 			Gson gson = new GsonBuilder().create();
 			LogRecvData<NtcSslRecordLog> fromJson = gson.fromJson(resJson,
@@ -114,6 +115,7 @@ public class SslRecordLogController extends BaseController {
 			model.addAttribute("serviceList", serviceList);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG;
+//			String url="http://192.168.11.198:8080/galaxy-service/service/log/v1/ntcSslRecordLogs";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
@@ -137,7 +139,7 @@ public class SslRecordLogController extends BaseController {
 			} else {
 				hColumns += ",";
 			}
-			String cfgIndexInfoNoExport = "," + hColumns;
+			String cfgIndexInfoNoExport = ",action,cfg_id," + hColumns;
 			noExportMap.put("ssl_record", cfgIndexInfoNoExport);
 			dataMap.put("ssl_record", list);
 			String timeRange = initLogMap(log, "ssl_record");
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
index c9d19e33b..90cdd01e4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
@@ -244,8 +244,8 @@
 						<thead>
 							<tr>
 								<th><spring:message code="log"/></th>
-								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th>
-								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th>
+<%-- 								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th> --%>
+<%-- 								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th> --%>
 								<th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th>
 								<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
@@ -290,16 +290,16 @@
 <%-- 									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> 鈻� </span><span  style="display: none" id="close${status.index}" > 鈻� </span> --%>
 										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/website/ajaxSslSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
-									<td>${log.cfgId }</td>
-									<td>
-										<c:set var="actions">${log.action }</c:set>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
-												<c:set var="actions">${dict.itemValue}</c:set>
-											</c:if>
-										</c:forEach>
-										<spring:message code="${actions}"/>
-									</td>
+<%-- 									<td>${log.cfgId }</td> --%>
+<!-- 									<td> -->
+<%-- 										<c:set var="actions">${log.action }</c:set> --%>
+<%-- 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> --%>
+<%-- 											<c:if test="${dict.itemCode eq log.action}"> --%>
+<%-- 												<c:set var="actions">${dict.itemValue}</c:set> --%>
+<%-- 											</c:if> --%>
+<%-- 										</c:forEach> --%>
+<%-- 										<spring:message code="${actions}"/> --%>
+<!-- 									</td> -->
 
 									<td>${log.foundTime }</td>
 									<td>${log.recvTime }</td>

From eecfe2c03e846fd2359607c871e5308fd2b0d547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 10:26:20 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=97=A5=E5=BF=97->SSL=E6=B3=9B=E6=94=B6=20C?=
 =?UTF-8?q?ontroller=E5=B1=82=E5=88=A0=E6=8E=89=E6=97=A0=E7=94=A8URL?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/controller/log/ntc/SslRecordLogController.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
index 45340fb17..12524cf20 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/SslRecordLogController.java
@@ -60,7 +60,6 @@ public class SslRecordLogController extends BaseController {
 		try {
 			// 璇锋眰鎺ュ彛
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG;
-//			String url="http://192.168.11.198:8080/galaxy-service/service/log/v1/ntcSslRecordLogs";
 			String resJson = HttpClientUtil.getMsg(url, params, request);
 			Gson gson = new GsonBuilder().create();
 			LogRecvData<NtcSslRecordLog> fromJson = gson.fromJson(resJson,
@@ -115,7 +114,6 @@ public class SslRecordLogController extends BaseController {
 			model.addAttribute("serviceList", serviceList);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_RECORD_LOG;
-//			String url="http://192.168.11.198:8080/galaxy-service/service/log/v1/ntcSslRecordLogs";
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();

From 04b57afd2fe3f3bda7d020ef129692abfffdfbe6 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Fri, 18 Jan 2019 10:35:09 +0800
Subject: [PATCH 15/18] =?UTF-8?q?SNAT=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=20=E9=9A=90=E8=97=8F=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=ADVPN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 58a6bfb0c..1162ccb47 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
@@ -213,15 +213,15 @@ var switchUserType = function(obj){
 								</div>
 								<div class="row">
 								<div class="row">
-									<div class="col-md-6">
+									<div class="col-md-6 hidden">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="user_type"/></label>
 								            <div class="col-md-6">
 								            	<select name="userType" class="selectpicker show-tick form-control required">
-				               						<option value=""><spring:message code="select"/></option>
-				               						<option value="VPN" <c:if test="${_cfg.userType eq 'VPN' }">selected</c:if>><spring:message code="policy_vpn_user"/></option>
-				               						<option value="SIPv4" <c:if test="${_cfg.userType eq 'SIPv4' }">selected</c:if>><spring:message code="policy_sipv4_user"/></option>
-				               						<option value="SIPv6" <c:if test="${_cfg.userType eq 'SIPv6' }">selected</c:if>><spring:message code="policy_sipv6_user"/></option>
+				               						<%-- <option value=""><spring:message code="select"/></option> --%>
+				               						<option value="VPN" selected ><spring:message code="policy_vpn_user"/></option>
+				               						<%-- <option value="SIPv4" <c:if test="${_cfg.userType eq 'SIPv4' }">selected</c:if>><spring:message code="policy_sipv4_user"/></option>
+				               						<option value="SIPv6" <c:if test="${_cfg.userType eq 'SIPv6' }">selected</c:if>><spring:message code="policy_sipv6_user"/></option> --%>
 								                </select>
 								            </div>
 								            <div for="userType"></div>

From fa933de0d80ef7a27d0483808e4ef69e760a3978 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Fri, 18 Jan 2019 10:42:07 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=EF=BC=8Capp=20policy,=E5=8A=A0=E5=AF=86=E9=9A=A7=E9=81=93?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E5=AF=BC=E5=85=A5=E5=B9=B6=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0APP=5FPOLICY=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/BaseService.java | 244 +++++++++++++-----
 1 file changed, 178 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index f66cabeaf..2d50007a1 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -1639,6 +1639,30 @@ public abstract class BaseService {
 		maatCfg.setIsValid(_cfg.getIsValid());
 		return maatCfg;
 	}
+	/**
+	 * MaatCfg 杩藉姞region
+	 */
+	public MaatCfg maatCfgAppendRegion(MaatCfg maatCfg,BaseCfg _cfg,Integer cfgType) {
+		if(maatCfg==null) return maatCfg;
+		Map<String,List> regions=cfgConvert(_cfg, cfgType);
+		if(regions.get("ipRegionList")!=null) {
+			maatCfg.getIpRegionList().addAll(regions.get("ipRegionList"));
+		}
+		if(regions.get("strRegionList")!=null) {
+			maatCfg.getStrRegionList().addAll(regions.get("strRegionList"));
+		}
+		if(regions.get("numRegionList")!=null) {
+			maatCfg.getNumRegionList().addAll(regions.get("numRegionList"));
+		}
+		if(regions.get("digestRegionList")!=null) {
+			maatCfg.getDigestRegionList().addAll(regions.get("digestRegionList"));
+		}
+		if(regions.get("groupRelationList")!=null) {
+			maatCfg.getGroupRelationList().addAll(regions.get("groupRelationList"));
+			maatCfg.setGroupNum(maatCfg.getGroupNum()+regions.get("groupRelationList").size());
+		}
+		return maatCfg;
+	}
 	/**
 	 * 鍒嗗壊骞朵繚瀛�
 	 * @param regionDict
@@ -1682,7 +1706,7 @@ public abstract class BaseService {
 				this.saveCfgIndexOf(cfgIndexInfos);
 			}
 			if (appPolicyCfgs != null && appPolicyCfgs.size() > 0) {
-				this.savePolicyList(appPolicyCfgs);
+				this.savePolicyList(regionDict,serviceDict,appPolicyCfgs,list,send);
 			}
 			if (appFeatureCfgs != null && appFeatureCfgs.size() > 0) {
 				this.saveAppFeatureList(appFeatureCfgs);
@@ -1692,7 +1716,7 @@ public abstract class BaseService {
 				List<BaseIpCfg> listPage = (List<BaseIpCfg>) list;
 				if (specificServiceCfg!=null&&regionDict.getFunctionId().equals(405)) {
 					this.saveAppIpCfg((List<BaseIpCfg>)listPage,specificServiceCfg,send);
-				}else {
+				}else if(appPolicyCfgs==null||appPolicyCfgs.isEmpty()){
 					this.saveIpBatch(regionDict,serviceDict,(List<BaseIpCfg>)listPage,send);
 				}
 			}else if("AsnIpCfg".equals(type)) {
@@ -1766,7 +1790,7 @@ public abstract class BaseService {
 					this.saveStringCfgBatch(regionDict,serviceDict,listPage, "http_url_cfg",send);
 				}
 				//璐﹀彿
-				else if("subscribe_id".equals(regionDict.getConfigServiceType())){
+				else if("subscribe_id".equals(regionDict.getConfigServiceType())&&(appPolicyCfgs==null||appPolicyCfgs.isEmpty())){
 					this.saveStringCfgBatch(regionDict,serviceDict,listPage, "ntc_subscribe_id_cfg",send);
 				}
 				// HTTP(s) URL
@@ -2352,17 +2376,167 @@ public abstract class BaseService {
 	/**
 	 * 瀵煎叆閰嶇疆淇濆瓨App绛栫暐
 	 * @param appPolicyCfgs
+	 * @throws CloneNotSupportedException 
 	 */
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void savePolicyList(List<AppPolicyCfg> appPolicyCfgs){
+	public void savePolicyList(FunctionRegionDict regionDict,FunctionServiceDict serviceDict,List<AppPolicyCfg> appPolicyCfgs,List<? extends BaseCfg> list,boolean send){
 		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
 		SqlSession batchSqlSession = null;
+		List<MaatCfg> configCompileList = new ArrayList();
 		try{
 			batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
 			for(int index = 0; index < appPolicyCfgs.size();index++){
 				AppPolicyCfg _cfg = appPolicyCfgs.get(index);
 				((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).insertAppPolicyCfgForBatch(_cfg);
+				
 			}
+			if(send) {
+				StringBuffer cfgKeywords = new StringBuffer();
+				if (appPolicyCfgs.get(0).getBehavCode() != null) {
+					if (regionDict.getFunctionId().equals(63)) {
+						cfgKeywords.append(Constants.APP_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode());
+					} else if (regionDict.getFunctionId().equals(407)
+							|| regionDict.getFunctionId().equals(408)) {
+						cfgKeywords.append(Constants.PROTO_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode());
+					}
+					cfgKeywords.append(Constants.KEYWORD_EXPR);
+					cfgKeywords.append(Constants.BEHAV_ID_REGION + "=" + appPolicyCfgs.get(0).getBehavCode());
+					// appPolicyCfgs.get(0.setCfgKeywords(appPolicyCfgs.get(0.getAppCode()+Constants.KEYWORD_EXPR+appPolicyCfgs.get(0.getBehavCode());
+				} else {
+					if (regionDict.getFunctionId().equals(63)) {
+						cfgKeywords.append(Constants.APP_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode());
+					} else if (regionDict.getFunctionId().equals(407)
+							|| regionDict.getFunctionId().equals(408)) {
+						cfgKeywords.append(Constants.PROTO_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode());
+					}
+					// entity.setCfgKeywords(entity.getAppCode()+"");
+				}
+				appPolicyCfgs.get(0).setCfgKeywords(cfgKeywords.toString());
+			}
+			List<Integer> groupIds=Lists.newArrayList();
+			List<Integer> regionIds=Lists.newArrayList();
+			if(send) {
+				groupIds=ConfigServiceUtil.getId(2, list.size());
+				regionIds=ConfigServiceUtil.getId(3, list.size());
+			}
+				for(int index = 0; index < list.size();index++){
+					MaatCfg maatCfg=null;
+					if(send) {
+						if(regionDict.getIsMaat().intValue()==1) {
+							AppPolicyCfg cfg=(AppPolicyCfg) appPolicyCfgs.get(0);
+							cfg.setCompileId(list.get(index).getCompileId());
+							cfg.setRegionId(regionIds.get(index));
+							cfg.setGroupId(groupIds.get(index));
+							maatCfg=convertMaatCfg(cfg,2);
+							if(regionDict.getFunctionId()==407) {// Protocol Identify
+								//PROTOCOL IDENTITY USER_REGION PROTOCOL_ID=ProtocolId
+								maatCfg.setUserRegion(Constants.PROTO_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode());
+								
+								// 闄愰�熶笟鍔￠渶瑕佽缃� USER_REGION Droprate=userregion3
+								if (Constants.RATELIMIT_ACTION.equals(appPolicyCfgs.get(0).getAction())) {
+									appPolicyCfgs.get(0).setUserRegion1(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion1()) ? "0":appPolicyCfgs.get(0).getUserRegion1());
+									//闄愰�� 闇�瑕佸彂Droprate=0.001 锛屾殏涓嶆敮鎸丅andwidth=200kbps
+									if(appPolicyCfgs.get(0).getUserRegion1().equals("0")){//涓㈠寘鐜�
+										appPolicyCfgs.get(0).setUserRegion2(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion2()) ? "":appPolicyCfgs.get(0).getUserRegion2());
+										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion2());
+									}else if(appPolicyCfgs.get(0).getUserRegion1().equals("1")){//甯﹀
+										appPolicyCfgs.get(0).setUserRegion3(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion3()) ? "":appPolicyCfgs.get(0).getUserRegion3());
+										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion3());
+									}
+								}
+								//DKC=8  USER_REGION DKC=userregion4
+								if(!StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion4()) && Constants.REJECT_ACTION.equals(appPolicyCfgs.get(0).getAction())){
+									maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion4());
+								}
+								// USER_REGION config_id=compileId
+								maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT+"config_id="+maatCfg.getCompileId());
+							}else if(regionDict.getFunctionId()==63) {// APP Policy
+								//APP IDENTITY USER_REGION鍖呭惈APP_ID=AppCode;BEHAV_ID=ProtocolId
+								maatCfg.setUserRegion(Constants.APP_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode()+Constants.USER_REGION_SPLIT+ Constants.BEHAV_ID_REGION + "=" + appPolicyCfgs.get(0).getBehavCode());
+								// 闄愰�熶笟鍔￠渶瑕佽缃�
+								if (Constants.RATELIMIT_ACTION.equals(appPolicyCfgs.get(0).getAction())) {
+									appPolicyCfgs.get(0).setUserRegion1(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion1()) ? "0":appPolicyCfgs.get(0).getUserRegion1());
+									//闄愰�� 闇�瑕佸彂Droprate=0.001 锛屾殏涓嶆敮鎸丅andwidth=200kbps
+									if(appPolicyCfgs.get(0).getUserRegion1().equals("0")){//涓㈠寘鐜�
+										appPolicyCfgs.get(0).setUserRegion2(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion2()) ? "":appPolicyCfgs.get(0).getUserRegion2());
+										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion2());
+									}else if(appPolicyCfgs.get(0).getUserRegion1().equals("1")){//甯﹀
+										appPolicyCfgs.get(0).setUserRegion3(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion3()) ? "":appPolicyCfgs.get(0).getUserRegion3());
+										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion3());
+									}
+								}
+								//DKC=8
+								if(!StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion4()) && Constants.REJECT_ACTION.equals(appPolicyCfgs.get(0).getAction())){
+									maatCfg.setUserRegion(Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion4());
+								}
+								maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT+"config_id="+appPolicyCfgs.get(0).getCompileId());
+							}else if(regionDict.getFunctionId()==408) {// Behavior Identify
+								//BEHAVIOR IDENTITY USER_REGION鍖呭惈APP_ID=AppCode;BEHAV_ID=ProtocolId
+								maatCfg.setUserRegion(Constants.PROTO_ID_REGION + "=" + appPolicyCfgs.get(0).getAppCode()+Constants.USER_REGION_SPLIT+ Constants.BEHAV_ID_REGION + "=" + appPolicyCfgs.get(0).getBehavCode());
+								// 闄愰�熶笟鍔￠渶瑕佽缃�
+								if (Constants.RATELIMIT_ACTION.equals(appPolicyCfgs.get(0).getAction())) {
+									appPolicyCfgs.get(0).setUserRegion1(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion1()) ? "0":appPolicyCfgs.get(0).getUserRegion1());
+									//闄愰�� 闇�瑕佸彂Droprate=0.001 锛屾殏涓嶆敮鎸丅andwidth=200kbps
+									if(appPolicyCfgs.get(0).getUserRegion1().equals("0")){//涓㈠寘鐜�
+										appPolicyCfgs.get(0).setUserRegion2(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion2()) ? "":appPolicyCfgs.get(0).getUserRegion2());
+										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion2());
+									}else if(appPolicyCfgs.get(0).getUserRegion1().equals("1")){//甯﹀
+										appPolicyCfgs.get(0).setUserRegion3(StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion3()) ? "":appPolicyCfgs.get(0).getUserRegion3());
+										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion3());
+									}
+								}
+								//DKC=8
+								if(!StringUtil.isEmpty(appPolicyCfgs.get(0).getUserRegion4()) && Constants.REJECT_ACTION.equals(appPolicyCfgs.get(0).getAction())){
+									maatCfg.setUserRegion(Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"="+appPolicyCfgs.get(0).getUserRegion4());
+								}
+								maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT+"config_id="+appPolicyCfgs.get(0).getCompileId());
+							}
+						}
+						
+					}
+					if(list.get(0) instanceof BaseIpCfg) {
+						BaseIpCfg _cfg=(BaseIpCfg)list.get(index);
+						batchSqlSession.getMapper(IpCfgDao.class).insertForBatch(_cfg);
+						if(send) {
+							maatCfg=maatCfgAppendRegion(maatCfg,_cfg,1);
+							//鏄惁闇�瑕佸鐞嗗瓧绗︿覆鍩焌nd琛ㄨ揪寮�
+							configCompileList.add(maatCfg);
+						}
+						
+					}else if(list.get(0) instanceof BaseStringCfg) {
+						BaseStringCfg _cfg=(BaseStringCfg)list.get(index);
+						if("subscribe_id".equals(regionDict.getConfigServiceType())) {
+							_cfg.setTableName("ntc_subscribe_id_cfg");
+						}
+						((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveStringCfgBatch(_cfg);
+						if(send) {
+							maatCfg=maatCfgAppendRegion(maatCfg,_cfg,2);
+							//鏄惁闇�瑕佸鐞嗗瓧绗︿覆鍩焌nd琛ㄨ揪寮�
+							configCompileList.add(maatCfg);
+						}
+					}
+				}
+				if (send) {
+		        	if(configCompileList.size() > 0) {
+		        		ToMaatBean maatBean = new ToMaatBean();
+						maatBean.setConfigCompileList(configCompileList);
+						maatBean.setAuditTime(new Date());
+						maatBean.setCreatorName(UserUtils.getUser().getName());
+						maatBean.setVersion(Constants.MAAT_VERSION);
+						maatBean.setOpAction(Constants.INSERT_ACTION);
+						// 璋冪敤鏈嶅姟鎺ュ彛涓嬪彂閰嶇疆鏁版嵁
+						String json = BaseService.gsonToJson(maatBean);
+						if(configCompileList.size()>10) {
+							logger.info("APP绛栫暐 閰嶇疆涓嬪彂閰嶇疆鏉℃暟锛�" + configCompileList.size());
+						}else {
+							logger.info("APP绛栫暐 閰嶇疆涓嬪彂閰嶇疆鍙傛暟锛�" + json);
+						}
+						// 璋冪敤鏈嶅姟鎺ュ彛涓嬪彂閰嶇疆
+						ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+						logger.info("APP绛栫暐 閰嶇疆涓嬪彂鍝嶅簲淇℃伅锛�" + result.getMsg());
+		        	}
+				}
+
 			batchSqlSession.commit();
 		}finally {
 			if(batchSqlSession != null){
@@ -2453,68 +2627,6 @@ public abstract class BaseService {
 //										maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+entity.getDnsStrategyId()+Constants.USER_REGION_SPLIT);
 										maatCfg.setUserRegion(Constants.DNS_STRATEGY_USER_REGION_KEY+"="+_cfg.getDnsStrategyId());
 									}
-								}else if(regionDict.getFunctionId()==407) {// Protocol Identify
-									//PROTOCOL IDENTITY USER_REGION PROTOCOL_ID=ProtocolId
-									maatCfg.setUserRegion(Constants.PROTO_ID_REGION + "=" + _cfg.getAppCode());
-									
-									// 闄愰�熶笟鍔￠渶瑕佽缃� USER_REGION Droprate=userregion3
-									if (Constants.RATELIMIT_ACTION.equals(_cfg.getAction())) {
-										_cfg.setUserRegion1(StringUtil.isEmpty(_cfg.getUserRegion1()) ? "0":_cfg.getUserRegion1());
-										//闄愰�� 闇�瑕佸彂Droprate=0.001 锛屾殏涓嶆敮鎸丅andwidth=200kbps
-										if(_cfg.getUserRegion1().equals("0")){//涓㈠寘鐜�
-											_cfg.setUserRegion2(StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2());
-											maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
-										}else if(_cfg.getUserRegion1().equals("1")){//甯﹀
-											_cfg.setUserRegion3(StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3());
-											maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+_cfg.getUserRegion3());
-										}
-									}
-									//DKC=8  USER_REGION DKC=userregion4
-									if(!StringUtil.isEmpty(_cfg.getUserRegion4()) && Constants.REJECT_ACTION.equals(_cfg.getAction())){
-										maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"="+_cfg.getUserRegion4());
-									}
-									// USER_REGION config_id=compileId
-									maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT+"config_id="+maatCfg.getCompileId());
-								}else if(regionDict.getFunctionId()==63) {// APP Policy
-									//APP IDENTITY USER_REGION鍖呭惈APP_ID=AppCode;BEHAV_ID=ProtocolId
-									maatCfg.setUserRegion(Constants.APP_ID_REGION + "=" + _cfg.getAppCode()+Constants.USER_REGION_SPLIT+ Constants.BEHAV_ID_REGION + "=" + _cfg.getBehavCode());
-									// 闄愰�熶笟鍔￠渶瑕佽缃�
-									if (Constants.RATELIMIT_ACTION.equals(_cfg.getAction())) {
-										_cfg.setUserRegion1(StringUtil.isEmpty(_cfg.getUserRegion1()) ? "0":_cfg.getUserRegion1());
-										//闄愰�� 闇�瑕佸彂Droprate=0.001 锛屾殏涓嶆敮鎸丅andwidth=200kbps
-										if(_cfg.getUserRegion1().equals("0")){//涓㈠寘鐜�
-											_cfg.setUserRegion2(StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2());
-											maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
-										}else if(_cfg.getUserRegion1().equals("1")){//甯﹀
-											_cfg.setUserRegion3(StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3());
-											maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+_cfg.getUserRegion3());
-										}
-									}
-									//DKC=8
-									if(!StringUtil.isEmpty(_cfg.getUserRegion4()) && Constants.REJECT_ACTION.equals(_cfg.getAction())){
-										maatCfg.setUserRegion(Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"="+_cfg.getUserRegion4());
-									}
-									maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+"config_id="+_cfg.getCompileId());
-								}else if(regionDict.getFunctionId()==408) {// Behavior Identify
-									//BEHAVIOR IDENTITY USER_REGION鍖呭惈APP_ID=AppCode;BEHAV_ID=ProtocolId
-									maatCfg.setUserRegion(Constants.APP_ID_REGION + "=" + _cfg.getAppCode()+Constants.USER_REGION_SPLIT+ Constants.BEHAV_ID_REGION + "=" + _cfg.getBehavCode());
-									// 闄愰�熶笟鍔￠渶瑕佽缃�
-									if (Constants.RATELIMIT_ACTION.equals(_cfg.getAction())) {
-										_cfg.setUserRegion1(StringUtil.isEmpty(_cfg.getUserRegion1()) ? "0":_cfg.getUserRegion1());
-										//闄愰�� 闇�瑕佸彂Droprate=0.001 锛屾殏涓嶆敮鎸丅andwidth=200kbps
-										if(_cfg.getUserRegion1().equals("0")){//涓㈠寘鐜�
-											_cfg.setUserRegion2(StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2());
-											maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
-										}else if(_cfg.getUserRegion1().equals("1")){//甯﹀
-											_cfg.setUserRegion3(StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3());
-											maatCfg.setUserRegion(maatCfg.getUserRegion()+Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+_cfg.getUserRegion3());
-										}
-									}
-									//DKC=8
-									if(!StringUtil.isEmpty(_cfg.getUserRegion4()) && Constants.REJECT_ACTION.equals(_cfg.getAction())){
-										maatCfg.setUserRegion(Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"="+_cfg.getUserRegion4());
-									}
-									maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+"config_id="+_cfg.getCompileId());
 								}else if(regionDict.getFunctionId()==301) {// Anti DDOS
 									Map umap= new HashMap();
 									umap.put("protocol", _cfg.getAntiddosProtocol());

From 18791f79da7e9aff98a0bbfb3f48242d9741faf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 11:01:48 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=97=A5=E5=BF=97->HTTP=E6=B3=9B=E6=94=B6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=20=E7=A7=BB=E9=99=A4=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=9C=89=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/log/ntc/HttpRecordLogController.java | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpRecordLogController.java
index 5c4d7d93a..88a2ab78a 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/HttpRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/HttpRecordLogController.java
@@ -65,7 +65,7 @@ public class HttpRecordLogController extends BaseController {
 			}
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
-			serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+//			serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
 			model.addAttribute("serviceList", serviceList);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_RECORD_LOG;
@@ -133,7 +133,7 @@ public class HttpRecordLogController extends BaseController {
 			}
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
-			serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+//			serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
 			model.addAttribute("serviceList", serviceList);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_RECORD_LOG;
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp
index da562a1d3..4d9e3d91a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp
@@ -353,9 +353,9 @@
 						<tbody>
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
-<!-- 									<td> -->
-<%-- <%-- 									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> 鈻� </span><span  style="display: none" id="close${status.index}" > 鈻� </span> --%>
-<%--  --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxHttpSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a> --%>
+									<td>
+<%--  									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> 鈻� </span><span  style="display: none" id="close${status.index}" > 鈻� </span> --%>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxHttpSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 <!-- 									</td> -->
 <%-- 									<td>${log.cfgId }</td> --%>
 									<td>

From ed77da00c401ec20d0a56b9f3a9b923a4f7da388 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@192.168.11.154>
Date: Fri, 18 Jan 2019 12:03:51 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E6=9B=B4=E6=AD=A3ASN=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8DGbps=E4=B8=BAGBps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/domain/report/NtcAsnRecord.java    | 13 ++++++++++---
 src/main/resources/messages/message_en.properties   |  3 ++-
 src/main/resources/messages/message_ru.properties   |  3 ++-
 .../resources/messages/message_zh_CN.properties     |  3 ++-
 .../webapp/WEB-INF/views/report/asnRecordList.jsp   |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/domain/report/NtcAsnRecord.java b/src/main/java/com/nis/domain/report/NtcAsnRecord.java
index 5877e78ef..f3bdcbb55 100644
--- a/src/main/java/com/nis/domain/report/NtcAsnRecord.java
+++ b/src/main/java/com/nis/domain/report/NtcAsnRecord.java
@@ -6,8 +6,9 @@ import com.nis.util.excel.ExcelField;
 public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
 	
 	private static final long serialVersionUID = -4947912502754359817L;
-	
-	@ExcelField(title="bps",sort=10)
+	@ExcelField(title="GBps",sort=10)
+	protected String GBps;
+	//@ExcelField(title="bps",sort=10)
 	protected String bps;
 	@ExcelField(title="pps",sort=9)
 	protected String pps;
@@ -26,7 +27,13 @@ public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
 		this.searchAsnType = searchAsnType;
 	}
 	protected String searchAsnType;//1:d_asn;2:s_asn
-	
+
+	public String getGBps() {
+		return bps;
+	}
+	public void setGBps(String gBps) {
+		GBps = this.getBps();
+	}
 	public String getBps() {
 		return bps;
 	}
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index f8d59f674..7fa96f445 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1475,4 +1475,5 @@ block_drop=Block(Drop)
 mail_record=Mail Records
 ssl_record=SSL Records
 http_record=HTTP Records
-second_bps=bps
\ No newline at end of file
+second_bps=bps
+GBps=GBps
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 0c0c00b84..86980082f 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1479,4 +1479,5 @@ framework_log=\u0421\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0438\u0440\u043e
 block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435)
 mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b
 ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438
-http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438
\ No newline at end of file
+http_record=HTTP \u0417\u0430\u043f\u0438\u0441\u0438
+GBps=GBps
\ 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 188458816..7ef037d10 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1475,4 +1475,5 @@ block_drop=\u5c01\u5835(\u4e22\u5f03)
 mail_record=\u90ae\u4ef6\u6cdb\u6536
 ssl_record=SSL\u6cdb\u6536
 http_record=HTTP\u6cdb\u6536
-second_bps=bps
\ No newline at end of file
+second_bps=bps
+GBps=GBps
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
index bdd37d706..8ba476c4a 100644
--- a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
@@ -230,7 +230,7 @@
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
 								<th class="sort-column s_asn" column="asn"><spring:message code="asn"/></th>
 								<th class="sort-column pps" column="pps"><spring:message code="pps"/></th>
-								<th class="sort-column bps" column="bps"><spring:message code="bps"/></th>
+								<th class="sort-column bps" column="bps"><spring:message code="GBps"/></th>
 							</tr>
 						</thead>
 						<tbody>