From 1272529eb6ffef0dd29d915c6bb9b1799fe53985 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 09:44:10 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4IP=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=B8=85=E7=90=86sql=20truncate=5Ft?=
 =?UTF-8?q?ables.sql=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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql
index cc02c5af3..7e25cdce1 100644
--- a/src/main/resources/sql/truncate_tables.sql
+++ b/src/main/resources/sql/truncate_tables.sql
@@ -59,4 +59,8 @@ DELETE FROM app_ip_range_cfg;
 DELETE FROM app_string_feature_cfg;
 DELETE FROM pxy_obj_trusted_ca_crl;
 DELETE FROM pxy_obj_trusted_ca_cert;
-UPDATE specific_service_cfg SET group_id=0;
\ No newline at end of file
+UPDATE specific_service_cfg SET group_id=0;
+DELETE FROM ip_reuse_addr_pool;
+DELETE FROM ip_reuse_ip_cfg;
+DELETE FROM ip_reuse_policy_cfg;
+DELETE FROM user_manage;
\ No newline at end of file

From 3566e0663e46623735738bc17369bdd7766f2c4c Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 10:17:10 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=20-?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=8F=A3=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=8A=E5=AD=97=E5=85=B8entrance=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/20181203/add_sys_data_dictionary_name.sql         | 8 ++++++++
 src/main/webapp/WEB-INF/views/report/entranceId.jsp       | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql

diff --git a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
new file mode 100644
index 000000000..541194dde
--- /dev/null
+++ b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
@@ -0,0 +1,8 @@
+#日志查询-串联设备链路号字典添加
+INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('147', '串联设备链路号', 'LINK', '串联设备链路号', 'user:管理员,2018-12-03 18:39:24edit', '2018-12-03 16:13:24', '2018-12-03 18:39:24', '1');
+
+
+#日志查询-出入口字典添加
+INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('81', '出入口', 'ENTRANCE', '出入口id和对应的名称', 'user:管理员,2018-12-03 18:45:59edit|用户管理员,在2018-08-07 09:53:56修改！|用户管理员,在2018-06-15 11:53:01修改！|用户管理员,在2018-06-15 11:52:16修改！|用户管理员,在2018-06-15 11:35:15修改！', '2018-06-15 11:34:02', '2018-12-03 18:45:59', '1');
+INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
+INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');
diff --git a/src/main/webapp/WEB-INF/views/report/entranceId.jsp b/src/main/webapp/WEB-INF/views/report/entranceId.jsp
index f4298ef1c..05136929b 100644
--- a/src/main/webapp/WEB-INF/views/report/entranceId.jsp
+++ b/src/main/webapp/WEB-INF/views/report/entranceId.jsp
@@ -20,7 +20,13 @@ $(function(){
 			<c:forEach items="${datas}" var="data">
 				trContent += "<tr>";
 				<c:forEach items="${data.key}" var="entranceId" varStatus="status">
-					trContent += "<td>${entranceId}</td>";
+				trContent += "<td>";
+				<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+					<c:if test="${dic.itemCode eq entranceId}">
+					trContent += "<spring:message code="${dic.itemValue}"/>";
+					</c:if>
+				</c:forEach>
+					trContent += "</td>";
 				</c:forEach>
 				<c:forEach items="${data.value}" var="cloumn" varStatus="status">
 					trContent += "<td>${cloumn}</td>";

From 78fb41ef2213346a412ca490b71187bda54def61 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Tue, 4 Dec 2018 10:24:16 +0800
Subject: [PATCH 3/8] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A0=B7=E4=BE=8B=E5=85=A8=E9=87=8F=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91;=202.=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E7=BD=AE=E4=BF=A1=E5=BA=A6=E5=80=BC=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?10=E7=9A=84=E6=97=B6=E5=80=99=E9=99=A4=E4=BB=A510;=203.?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BB=93=E6=9D=9F=E6=A0=87=E8=AF=86=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=B7=B2?=
 =?UTF-8?q?=E6=9C=89=E7=BB=93=E6=9D=9F=E6=A0=87=E8=AF=86=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=B2=A1=E6=9C=89=EF=BC=8C=E6=97=A0=E8=AE=BA=E8=AF=A5?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=98=AF=E5=90=A6=E6=9C=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=83=BD=E4=B8=8B=E5=8F=91=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=87=E8=AE=B0=E6=9C=AC?=
 =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AD=A5=E7=BB=93=E6=9D=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationDao.java             |  2 +
 .../ConfigSynchronizationDao.xml              | 19 ++++++++-
 .../ConfigSynchronizationService.java         | 41 +++++++++++++++----
 src/main/resources/service/service_config.xml |  2 +
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
index 906c35149..d3793a831 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
@@ -24,6 +24,7 @@ import com.nis.domain.configuration.AppStringCfg;
 import com.nis.domain.configuration.AppTcpCfg;
 import com.nis.domain.configuration.AppTopicDomainCfg;
 import com.nis.domain.configuration.AvFileSampleCfg;
+import com.nis.domain.configuration.AvSignSampleCfg;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
@@ -78,6 +79,7 @@ public interface ConfigSynchronizationDao {
 	public List<FileDigestCfg> getFileDigestListByService(BaseCfg entity);
 	
 	public List<AvFileSampleCfg> getAvFileCfgList(BaseCfg entity);
+	public List<AvSignSampleCfg> getAvSignCfgList(BaseCfg entity);
 	public List<PxyObjKeyring> getPxyObjKeyringCfgList(BaseCfg entity);
 	public List<PxyObjTrustedCaCert> getPxyObjTrustedCertCfgList(BaseCfg entity);
 	public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgList(BaseCfg entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
index ca6b6c9f5..1a5d6eb58 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
@@ -1216,11 +1216,26 @@
 	    </trim>
 		ORDER BY a.CFG_ID
   </select>
-   <select id="getAvSignSampleById" resultMap="AvSignSampleMap" parameterType="java.lang.Long" >
+   <select id="getAvSignCfgList" resultMap="AvSignSampleMap" parameterType="com.nis.domain.configuration.BaseCfg" >
     SELECT 
     <include refid="AvSignSample_Column" />
     FROM av_sign_sample_cfg a
-    WHERE a.CFG_ID = #{cfgId,jdbcType=BIGINT}
+    left join sys_user s on a.creator_id=s.id
+	left join sys_user u on a.auditor_id=u.id
+    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+    	<if test="serviceId != null">
+    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+    	</if>
+    	<if test="functionId != null">
+    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+    	</if>
+    	<if test="action != null">
+    		AND a.action=#{action,jdbcType=INTEGER}
+    	</if>
+    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
+    	and a.is_valid!=-1
+    </trim>
+	ORDER BY a.CFG_ID
   </select>
   <select id="getDnsStrategyList" resultMap="DnsResStrategyMap">
 		SELECT
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 115882bb9..31243a972 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -81,6 +81,7 @@ public class ConfigSynchronizationService  extends BaseService{
 	@Autowired
 	protected ConfigGroupInfoDao configGroupInfoDao;
 	private boolean lastServiceTag = false;//标识是否是最后一个同步业务
+	private boolean isFinished = false;
 	/**
 	 * 配置全量更新下发
 	 * @param request
@@ -134,6 +135,15 @@ public class ConfigSynchronizationService  extends BaseService{
 					Page<BaseCfg> page=new Page<BaseCfg>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
 					handleCallbackData(className,page,entity,request,response,false);
 				}
+				if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识
+					String json = "";
+					if("1".equals(serviceType)){
+						json="{}";
+					}else{
+						json="[]";
+					}
+					JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
+				}
 			}
 			long end = System.currentTimeMillis();
 			logger.info("本次配置全量同步,开始时间："+start
@@ -434,8 +444,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -482,6 +493,9 @@ public class ConfigSynchronizationService  extends BaseService{
 		List<Integer> compileIds = new ArrayList();
 		for(FileDigestCfg cfg:list){
 			compileIds.add(cfg.getCompileId());
+			if(!StringUtil.isEmpty(cfg.getCfdsLevel()) && (cfg.getCfdsLevel() > 10)){
+				cfg.setCfdsLevel((int)(cfg.getCfdsLevel()/10));//文件摘要置信度界面显示为70,80,90,100，下发为7,8,9,10
+			}
 			fileList.add(cfg);
 		}
 		
@@ -602,8 +616,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -791,8 +806,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -951,8 +967,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 		}
 		return hasData;
@@ -1160,8 +1177,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 			
 		}
@@ -1343,8 +1361,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 			
 		}
@@ -1461,8 +1480,9 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
 			}
 			
 		}
@@ -1535,6 +1555,10 @@ public class ConfigSynchronizationService  extends BaseService{
 		}else{
 			if(className.equals("AvFileSampleCfg")){
 				list = configSynchronizationDao.getAvFileCfgList(entity);
+				newList.addAll(list);
+			}else if(className.equals("AvSignSampleCfg")){
+				list = configSynchronizationDao.getAvSignCfgList(entity);
+				newList.addAll(list);
 			}else if(className.equals("PxyObjKeyring")){
 				list = configSynchronizationDao.getPxyObjKeyringCfgList(entity);
 				for(int i=0;i<list.size();i++){
@@ -1591,7 +1615,8 @@ public class ConfigSynchronizationService  extends BaseService{
 			}else {
 				FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
 				//调用服务接口同步回调类配置
-				JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),(((!hasData)&&lastServiceTag)?"FINISHED":null));
+				isFinished = ((!hasData)&&lastServiceTag)?true:false;
+				JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),isFinished?"FINISHED":null);
 			}
 		}
 		
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index dfb941c41..8f5fafcf0 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -373,6 +373,8 @@
 	 
 	 <service id="65" functionId="400" serviceType="2" tableName="dns_res_strategy" className="DnsResStrategy"  desc="DNS响应策略"/>
 	 <service id="64" functionId="400" serviceType="2" tableName="dns_ip_cfg" className="DnsIpCfg"  desc="DNS欺骗IP"/>
+	 <service id="266" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg"  desc="色情场景封堵"></service>
+	 <service id="394" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg"  desc="色情场景监测"></service>
 	<!-- 回调类配置结束-->
     
 </serviceList>
\ No newline at end of file

From 32120c83dc2e5ac73cbfcaa623b7f54ce56c208b Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 11:52:21 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=B8=A6=E5=AE=BD=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8CIPv4,6,Tcp,udp=E4=B8=BA=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/TrafficIpActiveStatistic.java   |  30 +--
 src/main/java/com/nis/util/Constants.java     |   1 +
 .../dashboard/DashboardController.java        |  19 +-
 .../TrafficStatisticsInfoController.java      |  55 ++++++
 src/main/resources/nis.properties             |   4 +-
 .../views/dashboard/dashBoardIndex.jsp        |   8 +-
 .../views/dashboard/trafficBandwidthList.jsp  | 174 ++++++++++++------
 .../views/dashboard/trafficIpActiveList.jsp   |   9 +-
 src/main/webapp/WEB-INF/views/report/list.jsp |  57 +++---
 .../webapp/static/pages/css/data_text.css     |  12 ++
 .../webapp/static/pages/scripts/echart.js     |  22 ++-
 .../webapp/static/pages/scripts/pageLogs.js   |   2 +-
 12 files changed, 254 insertions(+), 139 deletions(-)

diff --git a/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java b/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
index 4658de1fd..d39d49b34 100644
--- a/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
+++ b/src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
@@ -9,15 +9,15 @@ public class TrafficIpActiveStatistic{
 	@ExcelField(title="Area",sort=20)
 	String areaId;
 	@ExcelField(title="Number",sort=30)
-	Integer linkNum;
+	Long linkNum;
 	@ExcelField(title="C2S(Pkt)",sort=40)
-	Integer c2sPktNum;
+	Long c2sPktNum;
 	@ExcelField(title="S2C(Pkt)",sort=50)
-	Integer s2cPktNum;
+	Long s2cPktNum;
 	@ExcelField(title="C2S(Byte)",sort=60)
-	Integer c2sByteLen;
+	Long c2sByteLen;
 	@ExcelField(title="S2C(Byte)",sort=70)
-	Integer s2cByteLen;
+	Long s2cByteLen;
 	@ExcelField(title="Time",sort=80)
 	String statTime;
 	
@@ -48,34 +48,34 @@ public class TrafficIpActiveStatistic{
 	public void setAreaId(String areaId) {
 		this.areaId = areaId;
 	}
-	public Integer getLinkNum() {
+	public Long getLinkNum() {
 		return linkNum;
 	}
-	public void setLinkNum(Integer linkNum) {
+	public void setLinkNum(Long linkNum) {
 		this.linkNum = linkNum;
 	}
-	public Integer getC2sPktNum() {
+	public Long getC2sPktNum() {
 		return c2sPktNum;
 	}
-	public void setC2sPktNum(Integer c2sPktNum) {
+	public void setC2sPktNum(Long c2sPktNum) {
 		this.c2sPktNum = c2sPktNum;
 	}
-	public Integer getS2cPktNum() {
+	public Long getS2cPktNum() {
 		return s2cPktNum;
 	}
-	public void setS2cPktNum(Integer s2cPktNum) {
+	public void setS2cPktNum(Long s2cPktNum) {
 		this.s2cPktNum = s2cPktNum;
 	}
-	public Integer getC2sByteLen() {
+	public Long getC2sByteLen() {
 		return c2sByteLen;
 	}
-	public void setC2sByteLen(Integer c2sByteLen) {
+	public void setC2sByteLen(Long c2sByteLen) {
 		this.c2sByteLen = c2sByteLen;
 	}
-	public Integer getS2cByteLen() {
+	public Long getS2cByteLen() {
 		return s2cByteLen;
 	}
-	public void setS2cByteLen(Integer s2cByteLen) {
+	public void setS2cByteLen(Long s2cByteLen) {
 		this.s2cByteLen = s2cByteLen;
 	}
 	
diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java
index 5cc71b9d0..6dcf01299 100644
--- a/src/main/java/com/nis/util/Constants.java
+++ b/src/main/java/com/nis/util/Constants.java
@@ -697,6 +697,7 @@ public final class Constants {
 	public static final String TRAFFIC_IPACTIVE_FIVEMINUTE=Configurations.getStringProperty("trafficIpActiveFiveMinute","trafficIpActiveFiveMinute");
 	public static final String TRAFFIC_IPACTIVE_ONEHOUR=Configurations.getStringProperty("trafficIpActiveOneHour","trafficIpActiveOneHour");
 	public static final String NTC_RADIUS_REPORT=Configurations.getStringProperty("ntcRadiusReport","ntcRadiusReport");
+	public static final String TRAFFIC_BANDWIDTH_TRANS=Configurations.getStringProperty("trafficBandwidthTrans","trafficBandwidthTrans");
 	
 	/**
 	 * httpclient 工具超时时间设置
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 b5aca830b..6a26ac3e3 100644
--- a/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/DashboardController.java
@@ -171,7 +171,6 @@ public class DashboardController extends BaseController{
 				addMessage(redirectAttributes,"request_service_failed");
 			}
 		
-		
         model.addAttribute("ipActiveList", ipActiveList);
 		return "/dashboard/trafficIpActiveList";
 	}
@@ -661,29 +660,13 @@ public class DashboardController extends BaseController{
 			ip.setId(i);
 			ip.setIpAddr(3+i+".1.1."+i);
 			ip.setAreaId("11");
-			ip.setLinkNum(1212);
+			ip.setLinkNum(1212l);
 			list.add(ip);
 		}
 		page.setList(list);
 		model.addAttribute("page", page);
 		return "/dashboard/trafficWebTypeList";
 	}
-	@RequestMapping(value="bandwidthList")
-	public String bandwidthList(  HttpServletRequest request, HttpServletResponse response, Model model){
-		PageLog<TrafficIpActiveStatistic> page = new PageLog<TrafficIpActiveStatistic>(request, response);
-		List list = new ArrayList();
-		for (int i = 1; i < 10; i++) {
-			TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic();
-			ip.setId(i);
-			ip.setIpAddr(3+i+".1.1."+i);
-			ip.setAreaId("11");
-			ip.setLinkNum(1212);
-			list.add(ip);
-		}
-		page.setList(list);
-		model.addAttribute("page", page);
-		return "/dashboard/trafficBandwidthList";
-	}
 	
 ////////////////////////////////////////test
 	@RequestMapping(value="showChart")
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 c821303ef..31658dd93 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -6,15 +6,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.beust.jcommander.internal.Maps;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.PageLog;
+import com.nis.domain.dashboard.TrafficIpActiveStatistic;
 import com.nis.util.Constants;
+import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -97,5 +105,52 @@ public class TrafficStatisticsInfoController extends BaseController {
 		}
 		return m;
 	}
+	/**
+	 * 根据ip46,协议tcp,udp查询带宽 间隔5分钟数据
+	 */
+	@RequestMapping(value="bandwidthTrans")
+	@ResponseBody
+	public Map ipActiveMinuteList(@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType){
+		Map<String, Object> fromJsonList = new HashMap<String, Object>();
+		Map map = new HashMap();
+		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS;
+		if(!StringUtil.isBlank(addrType)){
+			url=url+"?addrType="+addrType;
+		}
+		if(transType!=null){
+			url=url+"?transType="+transType;
+		}
+		try {
+			String string = HttpClientUtil.get(url);
+			Gson gson = new GsonBuilder().create();
+			fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
+			logger.info("带宽1小时,间隔5分钟数据"+fromJsonList);
+			List list = (ArrayList) fromJsonList.get("data");
+			if(!StringUtil.isEmpty(list)){
+				map=(Map) list.get(0);
+			}
+			return map;
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("带宽详情数据获取错误"+e);
+		}
+		return map;
+	}
 	
+	@RequestMapping(value="bandwidthList")
+	public String bandwidthList(  HttpServletRequest request, HttpServletResponse response, Model model){
+		PageLog<TrafficIpActiveStatistic> page = new PageLog<TrafficIpActiveStatistic>(request, response);
+		List list = new ArrayList();
+		for (int i = 1; i < 10; i++) {
+			TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic();
+			ip.setId(i);
+			ip.setIpAddr(3+i+".1.1."+i);
+			ip.setAreaId("11");
+			ip.setLinkNum(1212l);
+			list.add(ip);
+		}
+		page.setList(list);
+		model.addAttribute("page", page);
+		return "/dashboard/trafficBandwidthList";
+	}
 }
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index ae075b913..4e1c8c3b6 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -567,4 +567,6 @@ userGet=UserGet
 userList=UserList
 ip_reuse_call_cgi_url=http://192.168.11.137:8090/command
 ipNumGet=IpNumGet
-allIpGet=AllIpGet
\ No newline at end of file
+allIpGet=AllIpGet
+#\u6D41\u91CF\u7EDF\u8BA1\u5E26\u5BBD\u8BE6\u60C5
+trafficBandwidthTrans=trafficBandwidthTrans
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index d3e25f512..473adffae 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -33,17 +33,16 @@
             <div class="text_1">
                 <div class="fr_fc">
                  <div class="fl_visual">
-                	<i class="fa fa-cloud-download"></i>
+                	<a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a>
                  </div>
                     <div class="fl_fc">
-<%--                    <a href="${ctx}/dashboard/bandwidthList"> 详情显示--%>
 						<p>
                         <label data-original-title="<spring:message code="bandwith"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
                          <!-- 网络带宽 --><spring:message code="bandwith"/>
                         </label>
                         </p>
-                 			<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 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>
                 <div class="fr_fc">
@@ -51,7 +50,6 @@
                 		<i class="fa fa-ban"></i>
                 	 </div>
                     <div class="fl_fc">
-<!--                         <a href="javacript:;"> -->
 						<p style="margin-left: 0px;width:100%">
                         <label data-original-title="<spring:message code="action_reject"/>" 
                          class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
index 3e8d12a6d..613efdaf7 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>
-	<spring:message code="traffic_ip_active"></spring:message>
+	<spring:message code="bandwith"></spring:message>
 </title>
 </head>
 <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/bandwidth.css">
@@ -13,35 +13,36 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/bandwidthList'"><spring:message code="refresh"/></button>
-	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><spring:message code="back"/></button>
+	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/traffic/bandwidthList'"><i class="fa fa-refresh"></i></button>
+	<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><i class="fa fa-history"></i></button>
 	</div>
 	<h3 class="page-title">
-		<spring:message code="Bandwidth"></spring:message>
+		<spring:message code="bandwith"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 	
-<div class="row">
-  <div class="col-md-3" style="padding-right: 1px; ">
+	<div class="row">
+	
+<!--   <div class="col-md-3" style="padding-right: 1px; ">
             <div class="panel panel-default">
                 <div class="panel-body" style="height: 500px;">
                     <h5 class="ng-binding">Bandwidth Data</h5>
                     <div id="deviceRank" class="drank hm-scroll">
                     <table>
                         <tbody>
-                        <!-- ngRepeat: item in rankItems -->
+                        ngRepeat: item in rankItems
                         <tr class="dtr active" onClick="rankItemChanged(id, name)" style="">
                             <td class="dtd1"><span class="ng-binding" style="">Total</span></td>
                             <td class="dtd2"><span class="tz" style="width: 100%; max-width: 100px;"></span></td>
                             <td class="dtd3"><span class="dy ng-binding1">234567891</span></td>
                         </tr>
-                        <!-- end ngRepeat: item in rankItems -->
+                        end ngRepeat: item in rankItems
                         <tr class="dtr" onClick="rankItemChanged(id, name)" style="">
                             <td class="dtd1"><span class="ng-binding">c2s</span></td>
                             <td class="dtd2"><span class="tz tz-from" style="width: 86.55%; max-width: 100px;"></span></td>
                             <td class="dtd3"><span class="dy ng-binding2">123456789</span></td>
                         </tr>
-                        <!-- end ngRepeat: item in rankItems -->
+                        end ngRepeat: item in rankItems
                         <tr class="dtr" onClick="rankItemChanged(id, name)" style="">
                             <td class="dtd1"><span class="ng-binding">s2c</span></td>
                             <td class="dtd2"><span class="tz tz-to" style="width: 5.59%; max-width: 100px;"></span></td>
@@ -51,31 +52,42 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div> -->
         
-		<div class="col-md-9" style="padding-left: 8px;">
-            <div class="panel panel-default">
-                <div class="panel-body" style="height: 500px">
-                    <h5 class="ng-binding">Bandwidth Trend</h5>
-                    <div id="trend" style="height: 400px; position: relative;" >
+		<div class="col-md-12">
+						<select id="unitType" class="selectpicker select2 input-small">
+							<option value="Gbps">Gbps</option>
+							<option value="pps">pps</option>
+							<option value="linkNumber"><spring:message code="link_num"/>/S</option>
+						</select>
+                	<br>
+                    <div id="trend" style="height: 480px; position: relative;" >
 	                    <div style="position: relative;">
-	                    		<div id="chart" style="width:96%;height:400px;"></div>
+	                    		<div id="chart" style="width:97%;height:480px;"></div>
 	                    </div>
                 	</div>
-            	</div>
-       	 	</div>
 		</div>
 </div>
 <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/bandwidth.css" type="text/css" />
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script type="text/javascript">
-
-
 $(document).ready(function(){
-	showBandwidthChart();
-	clickTrShowChart();
-		
+	var unitType=$("#unitType").val();
+	changeBandwidth(unitType);
+	$("#unitType").on("change",function(){
+		changeBandwidth($("#unitType").val());
+	});
+	
+	setInterval(function(){
+		changeBandwidth($("#unitType").val());
+		},500000);// 五分钟调用一次
 });
+function ajaxBandwidth(){
+	
+}
 //点击列表显示统计图
 function clickTrShowChart(response){
 	$("tbody .dtr").on("click",function(){
@@ -84,63 +96,109 @@ function clickTrShowChart(response){
 		showBandwidthChart();//
 	})
 }
-//点击列表显示统计图
-function rankItemChanged(id,name){
+// 默认显示四条线 ip46,tcp,udp
+function rankItemChanged(addrType,transType){
+	loading();
+	var result=null;
 	$.ajax({
-		url:"${ctx}/#",
+		url:"${ctx}/dashboard/traffic/bandwidthTrans",
 		type:"get",
-		data:{"id":id},
+		data:{"addrType":addrType,"transType":transType},
 		dataType:"json",
-		async:true,
+		async:false,
+		timeout:10000,
 		success:function (data){
-			showBandwidthChart();
+			if(data!=null){
+				result=(data)
+			}
+			closeTip();
+		},
+		error: function(data, textStatus, errorThrown){
+			closeTip();
+// 			warning_prompt("获取实时列表数据失败！",1500);
+		},
+		complete:function(XMLHttpRequest,status){//超时设置
+			closeTip();
 		}
-	
 	});
+	return result;
+}
+// 根据单位切换数据
+function changeBandwidth(unitType){
+	var ipv4=rankItemChanged(4,null);
+	var ipv6=rankItemChanged(6,null);
+	var transTcp=rankItemChanged(null,6);
+	var transUdp=rankItemChanged(null,17);
+	var xdata=ipv4.statTime;
+	if(unitType=="Gbps"){
+		ipv4data=ipv4.gbps;
+		ipv6data=ipv6.gbps;
+		tcpdata=transTcp.gbps;
+		udpdata=transUdp.gbps;
+	}
+	if(unitType=="pps"){
+		ipv4data=ipv4.pps;
+		ipv6data=ipv6.pps;
+		tcpdata=transTcp.pps;
+		udpdata=transUdp.pps;
+		
+	}
+	if(unitType=="linkNumber"){
+		ipv4data=ipv4.linkNum;
+		ipv6data=ipv6.linkNum;
+		tcpdata=transTcp.linkNum;
+		udpdata=transUdp.linkNum;
+	}
+	var series=new Array();
+	series.push({
+		name: "IPv4",
+		data: ipv4data
+	},{
+		name: "IPv6",
+		data: ipv6data
+	},{
+		name: "TCP",
+		data: tcpdata
+	},{
+		name: "UDP",
+		data: udpdata
+	});
+	showBandwidthChart(unitType,xdata,series);
 }
 /* 网络带宽时间维度趋势图 */
-function showBandwidthChart(){
+function showBandwidthChart(unitType,xdata,ydata){
 	var chart = Highcharts.chart('chart', {
 	    title: {
 	        text: null
 	    },
+	    navigation: {
+			buttonOptions: {
+				y: -15,
+				x: 5
+			}
+		},
+	    exporting: {
+			filename:'Bandwidth',
+			scale:1,
+			sourceWidth: 1280,
+			sourceHeight: 550,
+		},
 	    yAxis: {
 	        title: {
-	            text: 'bps'
+	            text: unitType
 	        }
 	    },
 	    legend: {
-	    	 enabled:false
+	    	enabled:true
 	    },
 		xAxis:{
 			type:'datetime',
-			dateTimeLabelFormats:{
-				day:'%Y-%m-%d %h'
-				}
+			categories: xdata,
 			},
-	    plotOptions: {
-	        series: {
-	            pointStart: Date.UTC(2018, 8, 16,1),
-	            pointInterval: 3600*1000,
-// 	            pointIntervalUnit:'day'
-	        }
+	  	credits:{//是否有highcharts水印
+	        enabled:false
 	    },
-
-	    series: [{
-	        name: 'bps',
-// 	        type:'spline',
-	        data: [43934, 32503, 57177, 69658, 97031, 69931, 87133, 54175]
-	    }],
-
-	    responsive: {
-	        rules: [{
-	            condition: {
-	                maxWidth: 500
-	            },
-	            chartOptions: {
-	            }
-	        }]
-	    }
+	    series: ydata,
 
 	});
 	
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
index ab0a4715c..c7b1cadd8 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
@@ -134,7 +134,7 @@ function showIpActiveChart(rs){
 	},
 	    yAxis: {
 	        title: {
-	            text: 'linkNumber'
+	            text: 'bytes'
 	        }
 	    },
 	    credits:{//是否有highcharts水印
@@ -150,7 +150,7 @@ function showIpActiveChart(rs){
 }
 	//活跃IP一小时间隔五分钟统计
 	function ipActiveMinuteList(){
-		
+		loading();
 		$.ajax({
 			url: '${ctx}/dashboard/ipActiveMinuteList',
 			type : "get" ,
@@ -158,10 +158,13 @@ function showIpActiveChart(rs){
 			cache:false,async:true,
 			success:function (rs) {
 				showIpActiveChart(rs);
+				closeTip();
 			},  
 			error: function(data, textStatus, errorThrown){
+				closeTip();
 //	 			warning_prompt("获取实时列表数据失败！",1500);
-			}  
+			},
+			
 		});
 		 
 	  }
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index c8f954acb..2f6b3e680 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -29,8 +29,8 @@ $(document).ready(function() {
 			$("#searchForm")[0].reset();
 		});
 		if(!"${bean.reportBusinessType}"){//default
-			$("#reportBusinessType").val("label_report");
-			ajaxReport("/report/ajaxNtcTagReport","#label");
+			$("#reportBusinessType").val("lwhh_report");
+			ajaxReport("/report/ajaxNtcLwhhReport","#lwhh");
 		}else if("${bean.reportBusinessType}"=="label_report"){
 			ajaxReport("/report/ajaxNtcTagReport","#label");
 		}else if("${bean.reportBusinessType}"=="lwhh_report"){
@@ -68,7 +68,7 @@ $(document).ready(function() {
 				}
 			}
 		});
-		ajaxServiceLogTotal();
+		//ajaxServiceLogTotal();
 		$("#export-btn").click(function(){
 			totaltb(1,-1);
 			var te = $(".in table").tableExport({
@@ -166,8 +166,8 @@ var ajaxServiceLogTotal=function(){
 		data:{
 			"services":services.join(","),
 			"functionId":$("#functionId").val(),
-			"reportType":$('[name="reportType"]').val(),
-			"reportTime":$('[name="reportTime"]').val()
+			"reportType":1/* $('[name="reportType"]').val() ,
+			"reportTime":$('[name="reportTime"]').val()*/
 		},
 		dataType:'json',
 		async:true,
@@ -328,11 +328,11 @@ function customColumnClick(){
 		
 		 var reportBusinessType=$("#reportBusinessType").val()
 		 var tableId="tagTable";
-		 if(reportBusinessType=="label_report"){
-			 tableId="tagTable";
-		 }else if(reportBusinessType=="lwhh_report"){
+		 if(reportBusinessType=="lwhh_report"){
 			 tableId="lwhhTable";
-		}else if(reportBusinessType=="src_ip_report"){
+		}else if(reportBusinessType=="label_report"){
+			 tableId="tagTable";
+		 } else if(reportBusinessType=="src_ip_report"){
 			tableId="contentTable1";
 		}else if(reportBusinessType=="attr_type_report"){
 			tableId="attrTypeTable";
@@ -373,22 +373,23 @@ white-space:nowrap;
 </head>
 <body>
 <div class="page-content">
-	<div class="theme-panel hidden-xs hidden-sm">
-		<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action"> --%>
+ 	<%-- 
+	<div class="theme-panel hidden-xs hidden-sm">		
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
-				<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
 				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96) && (service.serviceId ne 37) && (service.serviceId ne 149)}" >
 					    <div data-service="${service.serviceId}" class="service btn">
-							<spring:message code="${service.serviceName}"/>
-							<%-- <spring:message code="log_total"/> --%>
+							<spring:message code="total"/> 
+							<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+								<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
+									<spring:message code="${action.itemValue}"/>
+								</c:if>
+							</c:forEach>	
 							<span>0</span>
 						</div>
 					</c:if>
-				    
-				<%-- </c:if> --%>
 			</c:forEach>
-		<%-- </c:forEach> --%>
 	</div>
+	--%>
 	<h3 class="page-title">
 		<spring:message code="${bean.cfgName}"/>
 		<small><spring:message code="report_list"/></small>
@@ -486,8 +487,13 @@ white-space:nowrap;
 					<sys:message content="${message}"/>
 					<br>
 					<ul class="nav nav-tabs nav-justified"  >
+						<li
+						<c:if test="${bean.reportBusinessType eq 'lwhh_report' or bean.reportBusinessType ==null}">
+						class="active"
+						</c:if> 
+						><a class="lireport" data-bussiness="lwhh_report" data-toggle="tab" href="#lwhh" title="<spring:message code="lwhh_report"/>"  ><spring:message code="lwhh_report"/></a></li>
 						<li 
-						<c:if test="${bean.reportBusinessType eq 'label_report' or bean.reportBusinessType ==null}">
+						<c:if test="${bean.reportBusinessType eq 'label_report'}">
 						class="active"
 						</c:if>
 						><a   class="lireport" data-bussiness="label_report" data-toggle="tab" href="#label"  title="<spring:message code="label_report"/>"><spring:message code="label_report"/></a></li>
@@ -496,11 +502,6 @@ white-space:nowrap;
 						class="active"
 						</c:if>
 						><a class="lireport" data-bussiness="attr_type_report" data-toggle="tab" href="#attrType"   title="<spring:message code="attr_type_report"/>"  ><spring:message code="attr_type_report"/></a></li>
-						<li
-						<c:if test="${bean.reportBusinessType eq 'lwhh_report'}">
-						class="active"
-						</c:if> 
-						><a class="lireport" data-bussiness="lwhh_report" data-toggle="tab" href="#lwhh" title="<spring:message code="lwhh_report"/>"  ><spring:message code="lwhh_report"/></a></li>
 						<li 
 						<c:if test="${bean.reportBusinessType eq 'src_ip_report'}">
 						class="active"
@@ -518,18 +519,18 @@ white-space:nowrap;
 						><a class="lireport" data-bussiness="isp_report" data-toggle="tab" href="#entranceId"  title="<spring:message code="isp_report"/>"><spring:message code="isp_report"/></a></li>
 					</ul>
 					<div class="tab-content table-responsive">
+						<div id="lwhh" class="tab-pane fade
+						<c:if test="${bean.reportBusinessType eq 'lwhh_report' or bean.reportBusinessType ==null}">
+						 in active
+						</c:if>"></div>
 						<div id="label" class="tab-pane fade
-						<c:if test="${bean.reportBusinessType eq 'label_report' or bean.reportBusinessType ==null}">
+						<c:if test="${bean.reportBusinessType eq 'label_report'}">
 						 in active
 						</c:if>"></div>
 						<div id="attrType" class="tab-pane fade
 						<c:if test="${bean.reportBusinessType eq 'attr_type_report'}">
 						 in active
 						</c:if>"></div>
-						<div id="lwhh" class="tab-pane fade
-						<c:if test="${bean.reportBusinessType eq 'lwhh_report'}">
-						 in active
-						</c:if>"></div>
 						<div id="srcIp" class="tab-pane fade
 						<c:if test="${bean.reportBusinessType eq 'src_ip_report'}">
 						 in active
diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css
index 2198426ed..c2a2072ed 100644
--- a/src/main/webapp/static/pages/css/data_text.css
+++ b/src/main/webapp/static/pages/css/data_text.css
@@ -42,6 +42,18 @@ p{
   		position: relative;
   		margin-top: 15px;
 }
+.data_content .data_info .fr_fc .fl_visual a:link {
+	color: #C5C5C5 !important;
+}
+.data_content .data_info .fr_fc .fl_visual a:visited {
+	color: #C5C5C5 !important;
+}
+.data_content .data_info .fr_fc .fl_visual a:hover {
+	color: #716D6D !important;
+}
+.data_content .data_info .fr_fc .fl_visual a:active {
+	color: #716D6D !important;
+}
 .data_content .data_info .fr_fc .fl_fc{
     width: 70%;
     height: 110px;
diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js
index f2925c011..dc1295160 100644
--- a/src/main/webapp/static/pages/scripts/echart.js
+++ b/src/main/webapp/static/pages/scripts/echart.js
@@ -152,7 +152,7 @@
     		series: [{
     				type: 'pie',
     				innerSize: '70%',//圆环的大小
-    				name: 'count',
+    				name: 'bytes',
     				data: data
     		}],
 //    		drilldown:{
@@ -285,7 +285,7 @@
     		yAxis: {
     				min: 0,
     				title: {
-    						text: 'Link Number',
+    						text: 'bytes',
     						align:'high',
     						style: {//设置字体颜色
     							color: '#fff',
@@ -327,7 +327,7 @@
     	        enabled:false
     	    },
     		series: [{
-    			name: 'Link Number',
+    			name: 'bytes',
     			colorByPoint: true,
     			data: data
     		}],
@@ -447,7 +447,7 @@
     		yAxis: {
     				min: 0,
     				title: {
-						text: 'Link Number',
+						text: 'bytes',
 						align:'high',
 						style: {//设置字体颜色
 							color: '#fff',
@@ -473,7 +473,7 @@
     		},
     		plotOptions: {
     				column: {
-    				dataLabels: {//数字显示
+    				dataLabels: {// 柱形图上的数字显示
     					enabled: true,
     					allowOverlap: true, // 允许数据标签重叠
     					style: {//设置字体颜色
@@ -481,13 +481,15 @@
 							fontSize:'10px',
 							fontFamily:'Microsoft YaHei'
 						},
+						 
+//						format:"{point.y:.2f}",
 					},
 					showInLegend:false
     				},
     		},
     		
     		series: [{
-    			name: 'count',
+    			name: 'bytes',
     			colorByPoint: true,
     			data: data
     		}],
@@ -629,7 +631,7 @@ function echart_2(rs){
 				useHTML: true
 			},
 			series: [{
-					name: 'count',
+					name: 'bytes',
 					colorByPoint: true,
 					data: data
 			}],
@@ -773,7 +775,7 @@ function echart_5(rs){
 			useHTML: true
 		},
 		series: [{
-			name: 'count',
+			name: 'bytes',
 			colorByPoint: true,
 			data: data
 		}],
@@ -911,7 +913,7 @@ function echart_4(rs){
 			useHTML: true
 		},
 		series: [{
-			name: 'count',
+			name: 'bytes',
 			colorByPoint: true,
 			data: data,
 		}],
@@ -1049,7 +1051,7 @@ function echart_6(rs){
 			useHTML: true
 		},
 		series: [{
-			name: 'count',
+			name: 'bytes',
 			colorByPoint: true,
 			data: data,
 		}],
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index 313cc65b6..3c144f53d 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	// 隱藏日誌詳情
-	$("table.logTb .icon-book-open").hide();
+//	$("table.logTb .icon-book-open").hide();
 	// 界面鼠标悬停事件
 /*	$("table.logTb").find("td").not(":has(a)").bind("mouseover", function(){
 		var str = $(this).html(this.innerHTML.trim()).text();

From 6ae81cf82025cc250fdb7f09869e690fc125a97d Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 16:41:03 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8-IP?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80action=E8=BF=87=E6=BB=A4asn=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E6=9C=89=E7=9A=84=20entrance=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/report/NtcDestIpReportController.java    | 2 +-
 .../web/controller/report/NtcEntranceReportController.java  | 2 +-
 .../nis/web/controller/report/NtcLwhhReportController.java  | 4 ++--
 .../controller/report/NtcSrcipDomesticReportController.java | 2 +-
 .../nis/web/controller/report/NtcTagReportController.java   | 2 +-
 .../nis/web/controller/report/NtcXzReportController.java    | 2 +-
 .../resources/sql/20181203/add_sys_data_dictionary_name.sql | 1 -
 src/main/webapp/WEB-INF/views/report/list.jsp               | 6 +++---
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
index b8d762aa1..eadd99357 100644
--- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
@@ -36,7 +36,7 @@ public class NtcDestIpReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
index c0edf6ce4..c197a2e2a 100644
--- a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
@@ -35,7 +35,7 @@ public class NtcEntranceReportController extends BaseController {
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
index 09b9d092a..6e834403f 100644
--- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
@@ -34,10 +34,10 @@ public class NtcLwhhReportController extends BaseController {
 	@RequestMapping("/ajaxNtcLwhhReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
+		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
index e5f609cfc..433f917e6 100644
--- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
@@ -35,7 +35,7 @@ public class NtcSrcipDomesticReportController extends BaseController {
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
index 08ad4aca9..6af37d2a9 100644
--- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java
@@ -37,7 +37,7 @@ public class NtcTagReportController extends BaseController {
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
index c6106dbfb..5fc865c0f 100644
--- a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java
@@ -38,7 +38,7 @@ public class NtcXzReportController extends BaseController {
 		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
 		model.addAttribute("xzs", xzs);
 		if(bean.getServiceId()!=null){
-			bean.setServices(bean.getServiceId().toString());
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
diff --git a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
index 541194dde..c97a8c2bb 100644
--- a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
+++ b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
@@ -3,6 +3,5 @@ INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `
 
 
 #日志查询-出入口字典添加
-INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('81', '出入口', 'ENTRANCE', '出入口id和对应的名称', 'user:管理员,2018-12-03 18:45:59edit|用户管理员,在2018-08-07 09:53:56修改！|用户管理员,在2018-06-15 11:53:01修改！|用户管理员,在2018-06-15 11:52:16修改！|用户管理员,在2018-06-15 11:35:15修改！', '2018-06-15 11:34:02', '2018-12-03 18:45:59', '1');
 INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
 INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 2f6b3e680..7979d15d4 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -417,13 +417,13 @@ white-space:nowrap;
 									<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
 										<c:forEach items="${serviceList}" var="service" >
 										<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
-										    <c:if test="${service.serviceId ne 5}">
+										    <c:if test="${bean.functionId ne 5}">
 				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96) }" >
 											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
 											</c:if>
 										  </c:if>
-										   <c:if test="${service.serviceId  eq 5}">
-										      <c:if test="${(service.action ne 128) && (service.action ne 96) }" >
+										   <c:if test="${bean.functionId  eq 5}">
+										      <c:if test="${(service.action ne 128) && (service.action ne 96) &&  (service.serviceId ne 37) && (service.serviceId ne 149)  }" >
 											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
 										     </c:if>
 										   </c:if>

From f3336efea133baa598d2554eeebb84fc21693954 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 16:42:37 +0800
Subject: [PATCH 6/8] =?UTF-8?q?1.=E5=9C=B0=E5=9D=80=E6=B1=A0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=8D=95=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9B2.boxSolidCSS=E9=80=89=E6=8B=A9=E5=99=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9B3.snat=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E8=8E=B7=E5=8F=96=E6=9C=89=E6=95=88=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=B1=A0=E4=BF=A1=E6=81=AF=EF=BC=9B4.ftp=E3=80=81mail?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=A6=81=E7=94=A8reject=E5=8A=A8=E4=BD=9C?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/IpAddrPoolController.java     |   7 -
 .../manipulation/IpMultiplexController.java   |  44 +--
 .../resources/messages/message_en.properties  |   3 +-
 .../resources/messages/message_ru.properties  |   3 +-
 .../messages/message_zh_CN.properties         |   3 +-
 .../20181204/update_function_service_dict.sql |   6 +
 .../maintenance/ipMultiplexPool/snatform2.jsp | 282 +++++++++---------
 .../ipmulitiplex/snatPolicyForm2.jsp          |  31 +-
 .../webapp/static/global/css/components.css   |   2 +-
 9 files changed, 207 insertions(+), 174 deletions(-)
 create mode 100644 src/main/resources/sql/20181204/update_function_service_dict.sql

diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
index d05d67ae2..3981edec0 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
@@ -1,6 +1,5 @@
 package com.nis.web.controller.configuration.maintenance;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -9,9 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.eclipse.jetty.util.ajax.JSON;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -21,12 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.basics.IpReuseIpCfg;
-import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.IpAddrPoolCfg;
-import com.nis.domain.configuration.IpMultiplexPoolCfg;
-import com.nis.domain.configuration.UserManage;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
index ae8789d9b..74623f98c 100644
--- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
+++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
@@ -24,9 +24,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
@@ -34,7 +32,6 @@ import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.IpAddrPoolCfg;
-import com.nis.domain.configuration.IpMultiplexPoolCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
 import com.nis.domain.configuration.UserManage;
@@ -167,23 +164,9 @@ public class IpMultiplexController extends CommonController {
 		
 		// 获取用户信息 地址池信息
 		List<UserManage> users = userManageService.findUsers();
-		List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
-		List<IpAddrPoolCfg> addrPoolsNew=new ArrayList<>();
-		for (IpAddrPoolCfg addrPool : addrPools) {
-			Map<String, Object> params = new HashMap<String, Object>();
-			params.put("addr_pool_id", addrPool.getCfgId());
-			String url =Constants.IP_REUSE_CALL_CGI_URL ;
-			Map<String, Object> resultMap=ConfigServiceUtil.getCGIInfo(url, Constants.IP_NUM_GET, params);
-			if(!StringUtil.isEmpty(resultMap) 
-					&& !StringUtil.isEmpty(resultMap.get("num"))
-					&& Integer.parseInt(resultMap.get("num").toString()) > 0) {
-				addrPoolsNew.add(addrPool);
-			}
-		}
 		
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("users", users);
-		model.addAttribute("addrPools", addrPoolsNew);
 		model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
 		return "/cfg/manipulation/ipmulitiplex/snatPolicyForm2";
 	}
@@ -250,6 +233,31 @@ public class IpMultiplexController extends CommonController {
 		return "redirect:" + adminPath +"/manipulation/ipmulitiplex/snatPolicyList?functionId="+functionId;
 	}
 	
+	/**
+	 * 异步获取地址池信息
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = {"/ajaxGetAddrPools"})
+	public List<IpAddrPoolCfg> ajaxGetAddrPools(HttpServletRequest request, HttpServletResponse response){
+		List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
+		List<IpAddrPoolCfg> addrPoolsNew=new ArrayList<>();
+		for (IpAddrPoolCfg addrPool : addrPools) {
+			Map<String, Object> params = new HashMap<String, Object>();
+			params.put("addr_pool_id", addrPool.getCfgId());
+			String url =Constants.IP_REUSE_CALL_CGI_URL ;
+			Map<String, Object> resultMap=ConfigServiceUtil.getCGIInfo(url, Constants.IP_NUM_GET, params);
+			if(!StringUtil.isEmpty(resultMap) 
+					&& !StringUtil.isEmpty(resultMap.get("num"))
+					&& Integer.parseInt(resultMap.get("num").toString()) > 0) {
+				addrPoolsNew.add(addrPool);
+			}
+		}
+		return addrPoolsNew;
+	}
+	
 	@RequestMapping(value = {"/dnatPolicyList"})
 	public String dnatPolicyList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		this._ipList(cfgName,model, cfg, request, response);
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 9fafde797..3961b99e9 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1336,4 +1336,5 @@ address_pool_is_used=Address pool is used and cannot perform this operation!
 cgi_service_failed=Request CGI server failed
 available_ip=Available IP
 config_sync=Configuration Synchronization
-info_failed=Information Acquisition Failure
\ No newline at end of file
+info_failed=Information Acquisition Failure
+address_pool_ip_configuration=Address Pool IP Configuration
\ 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 262836982..5d5efdc8e 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1334,4 +1334,5 @@ address_pool_id=Address Pool ID
 log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 address_pool_is_used=Address pool is used and cannot perform this operation!
 available_ip=Available IP
-config_sync=Configuration Synchronization
\ No newline at end of file
+config_sync=Configuration Synchronization
+address_pool_ip_configuration=Address Pool IP Configuration
\ 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 7923f5fcc..f1a4397bb 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1334,4 +1334,5 @@ address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD
 cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
 available_ip=\u53EF\u7528IP\u5730\u5740
 config_sync=\u914D\u7F6E\u540C\u6B65
-info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
\ No newline at end of file
+info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
+address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E
\ No newline at end of file
diff --git a/src/main/resources/sql/20181204/update_function_service_dict.sql b/src/main/resources/sql/20181204/update_function_service_dict.sql
new file mode 100644
index 000000000..b15f3940d
--- /dev/null
+++ b/src/main/resources/sql/20181204/update_function_service_dict.sql
@@ -0,0 +1,6 @@
+-- ftp
+UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 42 AND function_id = 51;
+-- mail地址
+UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 149 AND function_id = 37;
+-- mail高级
+UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 37 AND function_id = 35;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
index 66ccbae35..74a0f7ea4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
@@ -11,6 +11,7 @@ $(function(){
 	if($(".ipDiv").hasClass("hidden")){
 		$(".ipDiv").remove();
 	}
+	$(".addDiv").removeClass("hidden");
 	if('${fn:length(serviceList)}'>1){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -39,23 +40,23 @@ $(function(){
 	
 	ipInfoDiv.removeClass("ipDiv");
 	ipInfoDiv.removeClass("hidden");
-	ipInfoDiv.find("button").each(function(){
-		$(this).removeClass("addDivBut");
-		$(this).children("font").attr("color","#ed6b75").attr("class","fa fa-times");
-	});
-	setFirstIpDiv();
 	resetIndex();
 });
 
 var resetDiv = function(obj){
 	// 添加 or 删除
-	if($(obj).hasClass("addDivBut")){
+	if($(obj).hasClass("addDiv")){
 		$(".ipInfo").last().after(ipInfoDiv.clone());
 	}else{
-		$(obj).parents(".ipInfo:first").remove();
+		if($(".ipInfo").length == 1){
+			top.$.jBox.tip("<spring:message code='one_more'/>");
+			return;
+		}else{
+			$(obj).parents(".ipInfo:first").remove();
+		}
 	}
 	
-	$(".selectpicker").selectpicker("render");// 重新渲染页面
+	$(".selectpicker").selectpicker("render");// 重新渲染
 	$("select[name$='ipType']").on("change",function(){
 		switchIpInfo(this); 
 	});
@@ -65,15 +66,6 @@ var resetDiv = function(obj){
 	resetIndex();
 }
 
-// 设置第一个div +
-var setFirstIpDiv = function(){
-	$(".ipInfo").not(".ipDiv").first().find("button").each(function(){
-		$(this).addClass("addDivBut");
-		$(this).children("font").attr("color","#27a4b0").attr("class","fa fa-plus");
-	});
-	
-}
-
 var resetIndex = function(){
 	// 设置索引
 	$(".ipInfo").not(".hidden").each(function(index,element){
@@ -178,15 +170,27 @@ var resetIndex = function(){
 										<div class="form-group">
 											<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 											<div class="col-md-6">
-												<form:textarea path="description" htmlEscape="false" rows="1" maxlength="128" class="form-control" />
+												<form:textarea path="description" htmlEscape="false" maxlength="128" class="form-control" />
 											</div>
 										</div>
 									</div>
 								</div>
 								
-								<div class="row ipInfo ipDiv <c:if test="${!empty _cfg.ipCfgs}">hidden</c:if>">							
-									<h5 class="page-header"></h5>
+								<h4 class="form-section">
+									<spring:message code="address_pool_ip_configuration" />
+									<small>
+										<span class="glyphicon glyphicon-plus addDiv"
+										onClick="resetDiv(this)" title="add"></span>
+									</small>
+								</h4>
+								<div class="row ipInfo boxSolid ipDiv <c:if test="${!empty _cfg.ipCfgs}">hidden</c:if>">							
 									<input type="hidden" name="ipCfgs[0].protocolId" value="0">
+	                           		<div class="row">
+										<div class="pull-right">
+											<span class="glyphicon glyphicon-remove pull-right" title="remove"
+												onClick="resetDiv(this);" />
+										</div>
+									</div>
 									<div class="row">
 									    <div class="col-md-6">
 									        <div class="form-group">
@@ -203,86 +207,7 @@ var resetIndex = function(){
 									            <div for="ipCfgs[0].ipType"></div>
 									        </div>
 									    </div>
-									    
 									    <div class="col-md-6">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
-									            <div class="col-md-6">
-									            	<div class="input-group">
-										                <input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress">
-										                <span class="input-group-btn">
-										                	<button class="btn btn-default addDivBut" onclick="resetDiv(this)" type="button"><font color="#27a4b0" class="fa fa-plus"></font></button>
-										                </span>
-									                </div>
-									            </div>
-												<div for="ipCfgs[0].srcIpAddress"></div>
-											</div>
-									    </div>
-									</div>
-									
-									<div class="row port">
-										<div class="col-md-6">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
-									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-															<option value="${ipPatternC.itemCode}">
-																<spring:message code="${ipPatternC.itemValue}"/>
-															</option>
-								              			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="ipCfgs[0].ipPattern"></div>
-									        </div>
-									    </div>
-									    <div class="col-md-6 hidden">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="ipCfgs[0].portPattern" class="selectpicker show-tick form-control required">
-									                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-															<option value="${portPatternC.itemCode}">
-																<spring:message code="${portPatternC.itemValue}"/>
-															</option>
-								              			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="ipCfgs[0].portPattern"></div>
-									        </div>
-									    </div>
-									    <div class="col-md-6">
-									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required portCheck" type="text" name="ipCfgs[0].srcPort">
-									            </div>
-									            <div for="ipCfgs[0].srcPort"></div>
-									        </div>
-									    </div>
-									</div>
-									<div class="row destPort">
-									    <div class="col-md-6">
-									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required ipCheck" type="text" name="ipCfgs[0].destIpAddress">
-									            </div>
-									            <div for="ipCfgs[0].destIpAddress"></div>
-									        </div>
-									    </div>
-									     <div class="col-md-6">
-									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
-									            <div class="col-md-6">
-									                 <input class="form-control required portCheck" type="text" name="ipCfgs[0].destPort">
-									            </div>
-									            <div for="ipCfgs[0].destPort"></div>
-									        </div>
-									    </div>
-									</div>
-									<div class="row hidden protocol">
-										<div class="col-md-6">
 											<div class="form-group hidden">
 												<label class="control-label col-md-3"><font color="red">*</font>
 													<spring:message code="protocol" /></label>
@@ -298,7 +223,83 @@ var resetIndex = function(){
 												</div>
 												<div for="ipCfgs[0].protocol"></div>
 											</div>
-										</div>
+										 </div>
+									</div>
+									
+									<div class="row ip">
+										<div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
+									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+															<option value="${ipPatternC.itemCode}">
+																<spring:message code="${ipPatternC.itemValue}"/>
+															</option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipCfgs[0].ipPattern"></div>
+									        </div>
+									    </div>
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+									            <div class="col-md-6">
+									            	<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress">
+										        </div>
+												<div for="ipCfgs[0].srcIpAddress"></div>
+											</div>
+									    </div>
+									</div>
+									
+									<div class="row port">
+										<div class="col-md-6">
+									        <div class="form-group hidden">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipCfgs[0].portPattern" class="selectpicker show-tick form-control required">
+									                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+															<option value="${portPatternC.itemCode}">
+																<spring:message code="${portPatternC.itemValue}"/>
+															</option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipCfgs[0].portPattern"></div>
+									        </div>
+									    </div>
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required portCheck" type="text" name="ipCfgs[0].srcPort">
+									            </div>
+									            <div for="ipCfgs[0].srcPort"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row destPort">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required ipCheck" type="text" name="ipCfgs[0].destIpAddress">
+									            </div>
+									            <div for="ipCfgs[0].destIpAddress"></div>
+									        </div>
+									    </div>
+									     <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+									            <div class="col-md-6">
+									                 <input class="form-control required portCheck" type="text" name="ipCfgs[0].destPort">
+									            </div>
+									            <div for="ipCfgs[0].destPort"></div>
+									        </div>
+									    </div>
+									</div>
+									<div class="row protocol">
 										<div class="col-md-6">
 											<div class="form-group hidden">
 												<label class="control-label col-md-3"><font color="red">*</font>
@@ -320,9 +321,14 @@ var resetIndex = function(){
 							</div>
 								
 								<c:forEach items="${_cfg.ipCfgs }" var="ipCfg" varStatus="index">
-									<div class="row ipInfo">
-									<h5 class="page-header"></h5>
+									<div class="row ipInfo boxSolid">
 									<input type="hidden" name="ipCfgs[0].protocolId" value="0">
+									<div class="row">
+										<div class="pull-right">
+											<span class="glyphicon glyphicon-remove pull-right" title="remove"
+												onClick="resetDiv(this);" />
+										</div>
+									</div>
 									<div class="row">
 									    <div class="col-md-6">
 									        <div class="form-group">
@@ -343,22 +349,28 @@ var resetIndex = function(){
 									        </div>
 									    </div>
 									    <div class="col-md-6">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
-									            <div class="col-md-6">
-									            	<div class="input-group">
-										                <input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }">
-										                <span class="input-group-btn">
-										                	<button class="btn btn-default" onclick="resetDiv(this)" type="button"><font color="#ed6b75" class="fa fa-times"></font></button>
-										                </span>
-									                </div>
-									            </div>
-												<div for="ipCfgs[0].srcIpAddress"></div>
+											<div class="form-group hidden">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="protocol" /></label>
+												<div class="col-md-6">
+													<select name="ipCfgs[0].protocol"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+															<option value="${protocolC.itemCode}"
+																<c:if test="${ipCfg.protocol == protocolC.itemCode}">
+																	selected
+																</c:if>>
+																<spring:message code="${protocolC.itemValue}"/>
+															</option>
+														</c:forEach>
+													</select>
+												</div>
+												<div for="ipCfgs[0].protocol"></div>
 											</div>
-									    </div>
+										</div>
 									</div>
 									
-									<div class="row port">
+									<div class="row ip">
 										<div class="col-md-6">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
@@ -377,7 +389,19 @@ var resetIndex = function(){
 									            <div for="ipCfgs[0].ipPattern"></div>
 									        </div>
 									    </div>
-									    <div class="col-md-6 hidden">
+									    <div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
+									            <div class="col-md-6">
+									            	<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }">
+										        </div>
+												<div for="ipCfgs[0].srcIpAddress"></div>
+											</div>
+									    </div>
+									</div>
+									
+									<div class="row port">
+										<div class="col-md-6 hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
 									            <div class="col-md-6">
@@ -407,7 +431,7 @@ var resetIndex = function(){
 									</div>
 									<div class="row destPort">
 									    <div class="col-md-6">
-									        <div class="form-group ">
+									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required ipCheck" type="text" name="ipCfgs[0].destIpAddress" value="${ipCfg.destIpAddress }">
@@ -416,7 +440,7 @@ var resetIndex = function(){
 									        </div>
 									    </div>
 									     <div class="col-md-6">
-									        <div class="form-group ">
+									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required portCheck" type="text" name="ipCfgs[0].destPort" value="${ipCfg.destPort }">
@@ -425,27 +449,7 @@ var resetIndex = function(){
 									        </div>
 									    </div>
 									</div>
-									<div class="row hidden protocol">
-										<div class="col-md-6">
-											<div class="form-group hidden">
-												<label class="control-label col-md-3"><font color="red">*</font>
-													<spring:message code="protocol" /></label>
-												<div class="col-md-6">
-													<select name="ipCfgs[0].protocol"
-														class="selectpicker show-tick form-control required">
-														<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-															<option value="${protocolC.itemCode}"
-																<c:if test="${ipCfg.protocol == protocolC.itemCode}">
-																	selected
-																</c:if>>
-																<spring:message code="${protocolC.itemValue}"/>
-															</option>
-														</c:forEach>
-													</select>
-												</div>
-												<div for="ipCfgs[0].protocol"></div>
-											</div>
-										</div>
+									<div class="row protocol">
 										<div class="col-md-6">
 											<div class="form-group hidden">
 												<label class="control-label col-md-3"><font color="red">*</font>
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 7249c070c..2523bc36a 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
@@ -18,7 +18,29 @@ $(function(){
 			form.submit();
 		},
 		errorContainer: "#messageBox"
-	}); 
+	});
+	
+	// 获取地址池信息
+	var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
+	$.ajax({
+		type:'get',
+		url:pathName+'/manipulation/ipmulitiplex/ajaxGetAddrPools',
+		dataType:'json',
+		success:function(data){
+			if(data != null){
+				//$("#addrPoolSel").empty();
+				$.each(data, function(i, n){
+					if("${_cfg.addrPoolId}" == data[i].cfgId){
+						var option = new Option(data[i].addrPoolName, data[i].cfgId, null, true);
+					}else{
+						var option = new Option(data[i].addrPoolName, data[i].cfgId);
+					}
+					$("#addrPoolSel")[0].options.add(option);
+				});
+				$("#addrPoolSel").selectpicker("refresh");
+			}
+		}
+	});
 });
 </script>
 </head>
@@ -157,12 +179,9 @@ $(function(){
 										<div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="address_pool"/></label>
 								            <div class="col-md-6">
-								            	<select name="addrPoolId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
+								            	<select id="addrPoolSel" name="addrPoolId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 				               						<option value="" ><spring:message code="select"/></option>
-				               						<c:forEach items="${addrPools }" var="addrPool">
-														<option value="${addrPool.cfgId}" <c:if test="${_cfg.addrPoolId eq addrPool.cfgId }">selected</c:if>><spring:message code="${addrPool.addrPoolName}"/></option>
-							              			</c:forEach>
-								                </select>
+				               					</select>
 								            </div>
 								            <div for="addrPoolId"></div>
 								        </div>
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css
index 28d091624..c1ef22272 100644
--- a/src/main/webapp/static/global/css/components.css
+++ b/src/main/webapp/static/global/css/components.css
@@ -22614,7 +22614,7 @@ span[id^='close']{
 	background: #e7ecf1;
 	border:none
 }
-.form-section + .boxSolid {
+.form-section ~ .boxSolid {
 	border: 1px solid #eeeeee;
 	margin-top:-14px;
 	margin-bottom:10px

From 49f0b1a1a81a7e2de487a860d500b8f20aad00e8 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 17:53:51 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=B0=8F=E5=9B=BE=E4=B9=A6=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=20=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=BF=87=E6=BB=A4=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E5=92=8Casn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp   |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/appList.jsp    |  2 +-
 .../webapp/WEB-INF/views/log/ntc/bgpList.jsp    |  6 +++---
 .../WEB-INF/views/log/ntc/collectVoipList.jsp   |  2 +-
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp   |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/dnsList.jsp    |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp    |  6 +++---
 .../WEB-INF/views/log/ntc/httpKeyList.jsp       |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp   |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp     |  4 ++--
 .../webapp/WEB-INF/views/log/ntc/ipsecList.jsp  |  2 +-
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp       |  2 +-
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp   |  4 ++--
 .../webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp |  2 +-
 .../WEB-INF/views/log/ntc/mmAvUrlList.jsp       |  2 +-
 .../WEB-INF/views/log/ntc/mmFileDigestList.jsp  |  6 +++---
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp       |  2 +-
 .../WEB-INF/views/log/ntc/mmPicUrlList.jsp      |  2 +-
 .../views/log/ntc/mmPornAudioSampleList.jsp     |  2 +-
 .../views/log/ntc/mmPornVideoSampleList.jsp     |  4 ++--
 .../WEB-INF/views/log/ntc/mmSampleAudioList.jsp |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleFaceList.jsp  |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleLogoList.jsp  |  6 +++---
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp   |  6 +++---
 .../views/log/ntc/mmSampleSpeakerList.jsp       |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleVideoList.jsp |  6 +++---
 .../WEB-INF/views/log/ntc/mmSampleVoipList.jsp  |  6 +++---
 .../WEB-INF/views/log/ntc/mmVoipAccountList.jsp |  2 +-
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp      |  6 +++---
 .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp    |  6 +++---
 .../WEB-INF/views/log/ntc/openVpnList.jsp       |  2 +-
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp    |  6 +++---
 .../WEB-INF/views/log/ntc/pptpLogList.jsp       |  2 +-
 .../webapp/WEB-INF/views/log/ntc/sshList.jsp    |  2 +-
 .../webapp/WEB-INF/views/log/ntc/sslLogList.jsp |  4 ++--
 .../WEB-INF/views/log/pxy/pxyHttpList.jsp       |  6 +++---
 src/main/webapp/WEB-INF/views/report/list.jsp   | 17 ++++-------------
 37 files changed, 82 insertions(+), 91 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 1b173a304..5c0a7f969 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -221,7 +221,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -266,8 +266,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index 4f6014cd7..50b0a7737 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index c6a07b6e2..b14de0212 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -210,7 +210,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-							 	<th><spring:message code="log_to_cfg"/></th>
+							 	<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -251,8 +251,8 @@
 							<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"><i class="icon-book-open"></i></a>
+<%-- 									<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
index 9053042af..d8f684edb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
@@ -140,7 +140,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column pid"><spring:message code="pid"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
 								<th class="sort-column recv_time"><spring:message code="recv_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 3018d3940..de8852bf0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -201,7 +201,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -248,8 +248,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index 648f0dda2..649c8640e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -218,7 +218,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -267,8 +267,8 @@
 							<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"><i class="icon-book-open"></i></a>
+<%-- 									<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index c763fb555..a40b9a914 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -211,7 +211,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -252,8 +252,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 									<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
index 0ab724095..627740012 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
@@ -245,7 +245,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><input type="checkbox" class="i-checks" id="checkAll"> <spring:message code="log_to_cfg"/></th>
+								<th><input type="checkbox" class="i-checks" id="checkAll"> <spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -288,8 +288,8 @@
 								<tr>
 									<td>
 										<input type="checkbox" class="i-checks child-checks" compileId="${log.cfgId }" url="${log.url}" value="${log.cfgId }">
-										<span id="open${status.index}" class="log-open-cfg" compileId2="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
-										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+<%-- 										<span id="open${status.index}" class="log-open-cfg" compileId2="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 84d1cc2a7..851ea4ba9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -219,7 +219,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -268,8 +268,8 @@
 							<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"><i class="icon-book-open"></i></a>
+<%-- 									<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index ae2410bf1..6203f7834 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -212,7 +212,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -248,7 +248,7 @@
 							<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>
+									<%-- <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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index e61aa6a92..adc06ab65 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -156,7 +156,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service"  isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 887d8b8cf..d62e802b5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -168,7 +168,7 @@
 								<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index 70f549094..0316b4b85 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -210,7 +210,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -254,7 +254,7 @@
 							<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>
+<%-- 									<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 13e866e93..1a02a6f94 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 5ebf15cc3..7c41e744e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index 562a0bff4..511f36fde 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -209,7 +209,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -254,8 +254,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 0b55f24d2..643f0bdfa 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index b39c8f184..cfc4874ec 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -164,7 +164,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 5dd5d10dc..a447f3287 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index 0698c34a5..0d6031e99 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,7 +253,7 @@ $(document).ready(function(){
 							<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>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 7049fc3a3..c48c268ae 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -267,7 +267,7 @@
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -313,8 +313,8 @@
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index 9c177f962..3e7fad614 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index 1fbae5bc3..d8e26a489 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 2304b339f..39ceb7482 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index 13d0fd4cf..6c8f9a97f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 12b36509d..621beb261 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -209,7 +209,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>	
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -254,8 +254,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 3bcf1da8c..6110804f9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -259,8 +259,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index 80a82b667..d295b7947 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index cc269072e..81e7c3d5b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -209,7 +209,7 @@ $(document).ready(function(){
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -262,8 +262,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
index a929cc7f8..7e584483b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -208,7 +208,7 @@ $(document).ready(function(){
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -247,8 +247,8 @@ $(document).ready(function(){
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index a700a0a9a..bad2c852e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index fcf491901..c02fea121 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -210,7 +210,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -251,8 +251,8 @@
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 95997151f..272b23e35 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -166,7 +166,7 @@
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index cf93e3df1..cdece1971 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 28ec4e91b..d70e271df 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -223,7 +223,7 @@
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -265,7 +265,7 @@
 							<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>
+<%-- 									<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index b53cdc096..84fc96043 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -196,7 +196,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log_to_cfg"/></th>
+								<th><spring:message code="log"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -249,8 +249,8 @@
 							<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"><i class="icon-book-open"></i></a>
+<%-- 										<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"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 7979d15d4..01effc00b 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -373,10 +373,9 @@ white-space:nowrap;
 </head>
 <body>
 <div class="page-content">
- 	<%-- 
-	<div class="theme-panel hidden-xs hidden-sm">		
+<%-- 	<div class="theme-panel hidden-xs hidden-sm">		
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
-				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96) && (service.serviceId ne 37) && (service.serviceId ne 149)}" >
+				      <c:if test="${(service.action ne 128)  && (service.serviceId ne 37) && (service.serviceId ne 149)}" >
 					    <div data-service="${service.serviceId}" class="service btn">
 							<spring:message code="total"/> 
 							<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
@@ -388,8 +387,7 @@ white-space:nowrap;
 						</div>
 					</c:if>
 			</c:forEach>
-	</div>
-	--%>
+	</div> --%>
 	<h3 class="page-title">
 		<spring:message code="${bean.cfgName}"/>
 		<small><spring:message code="report_list"/></small>
@@ -417,15 +415,8 @@ white-space:nowrap;
 									<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
 										<c:forEach items="${serviceList}" var="service" >
 										<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
-										    <c:if test="${bean.functionId ne 5}">
-				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96) }" >
+										      <c:if test="${(service.action ne 128) && (service.serviceId ne 37) && (service.serviceId ne 149)  }" >
 											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
-											</c:if>
-										  </c:if>
-										   <c:if test="${bean.functionId  eq 5}">
-										      <c:if test="${(service.action ne 128) && (service.action ne 96) &&  (service.serviceId ne 37) && (service.serviceId ne 149)  }" >
-											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
-										     </c:if>
 										   </c:if>
 										<%-- </c:if> --%>
 										</c:forEach>

From ebbf999cf73229c469592cff7c960a6d0b878421 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Wed, 5 Dec 2018 09:28:11 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8EIP=E6=88=96=E5=9F=9F=E5=90=8D=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BF=EF=BC=8C=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=97=A0=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=97=B6=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=8F=91{}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/ConfigServiceUtil.java   |  2 ++
 .../configuration/ConfigSynchronizationService.java |  6 +++---
 src/main/resources/service/service_config.xml       | 13 +++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java
index 4ac6a0320..c29b8b35f 100644
--- a/src/main/java/com/nis/util/ConfigServiceUtil.java
+++ b/src/main/java/com/nis/util/ConfigServiceUtil.java
@@ -717,6 +717,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			throw e;
 		}finally {
 			if (response != null) {
@@ -781,6 +782,7 @@ public class ConfigServiceUtil {
 			//创建连接
 			WebTarget wt = ClientUtil.getWebTarger(url);
 			logger.info("sync_send url:"+url);
+			logger.info("Last-Completed-Tag:"+completeTag);
 			//获取响应结果
 			Builder header = wt.request(MediaType.APPLICATION_JSON)
 										.header("Content-Type", MediaType.APPLICATION_JSON)
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 31243a972..d59e6ea03 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -136,12 +136,12 @@ public class ConfigSynchronizationService  extends BaseService{
 					handleCallbackData(className,page,entity,request,response,false);
 				}
 				if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识
-					String json = "";
-					if("1".equals(serviceType)){
+					String json = "{}";
+					/*if("1".equals(serviceType)){
 						json="{}";
 					}else{
 						json="[]";
-					}
+					}*/
 					JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
 				}
 			}
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 8f5fafcf0..68288cb69 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -86,7 +86,7 @@
 	</service>
 	<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="邮件地址白名单">
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
 	</service>
 	<!--<service id="132" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
     	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
@@ -98,12 +98,12 @@
 	</service>-->
 	<service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="邮件地址监测">
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
     	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
 	</service>
     <service id="20" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵">
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-    	<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
+    	<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
     	<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
 	</service>
 	
@@ -178,9 +178,9 @@
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
     	<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0" ></userRegion>
 	</service>
-	<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
+	<!-- <service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
     	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
-	</service>
+	</service> -->
 	<service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截监测">
     	<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
     	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"   userRegionPosition="0"></userRegion>
@@ -188,7 +188,8 @@
     	<userRegion regionKey="keyring_id" regionColumn="userRegion1"  userRegionPosition="0"></userRegion>
     	<userRegion regionKey="intensity" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
 	</service>
-	<service id="521" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截白名单">
+	<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP或域名拦截白名单">
+    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
     	<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
 	</service>
 	<service id="515" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo"  desc="域名拦截限速">