From a7a31d9678b95408f71aa08b12e0be65175c3c5b Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Thu, 25 Oct 2018 15:18:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E5=AD=97info=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag                 | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp     | 2 +-
 .../WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp       | 4 ++--
 src/main/webapp/static/global/scripts/common.js             | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 4f773d9b7..3e1591fd8 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -212,7 +212,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					var requestName =requestNameArr[1];
 					
 					if(requestName.indexOf("null")==-1&&typeof(indexTableName)!="undefined"&&indexTableName!=null&&indexTableName!=''&&indexTableName.indexOf("null")==-1){
-					$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>", 400, 500, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
+					$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>", 400, 400, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
 						submit: function (v, h, f) {
 				    if (v == 0) {
 				        return true; // close the window
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index b9e147af0..4124349b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -328,7 +328,7 @@ function sampleFileValidate(fileType,fileName){
 							            	 	</c:choose>
 							            </div>
 							            &nbsp;<span id="fileNoteInfo" title="<spring:message code="select_file"/>" 
-							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"> <spring:message code="info"/></span>
+							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
 							            <div for="srcFileInfo"></div>
 							            <div id="fileErrorNote"></div>
 							        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index 6df5b26a5..927c29225 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -5,7 +5,7 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 	$(function() {
-		var fileType=["txt","doc","img","docx","pptx","xlsx","xls","ppt","mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv","wav","mp3"];//使用是什么格式的后缀
+		var fileType=["txt","doc","img","docx","pptx","xlsx","xls","ppt","mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","\n","m4b","webm","ogv","wav","mp3"];//使用是什么格式的后缀
 		$("#fileNoteInfo").attr("title","<spring:message code='select_file'/>: "+fileType);
 		$("#uploadSrc,#fileInfo").on('click', function() {
 			$("#file").trigger("click");
@@ -253,7 +253,7 @@
 													value="${_cfg.rawLen }" />
 											</div>
 											   &nbsp;<span id="fileNoteInfo" title="<spring:message code="select_file"/>" 
-							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"> <spring:message code="info"/></span>
+							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
 										<div for="fileInfo"></div>
 							            <div id="fileErrorNote"></div>
 										</div>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 0e5fe0f97..b88cafeb0 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,5 +1,5 @@
 $(function(){
-	var leff =$("span[class~='le-ca-fo']").attr("data-original-title")
+//	var leff =$("span[class~='le-ca-fo']").attr("data-original-title")
 	
 	$("#contentTable").not(".logTb").find("tbody tr").each(function(i){
 		if($(this).find("input[type='checkbox']").attr("value")==3){
@@ -16,9 +16,9 @@ $(function(){
 					success:function(data){//处理返回结果
 						//根据表名跟cfgid获取 requestNumber；
 						if(data.requestTitle!=null){
-							resetLeff.attr("data-original-title",leff+data.requestTitle)
+							resetLeff.attr("data-original-title",data.requestTitle)
 						}else{
-							resetLeff.attr("data-original-title",leff+"")
+							resetLeff.attr("data-original-title","")
 						}
 					}
 				});

From d1a13acf432f852408464885a6fc22ea9603aebe Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Thu, 25 Oct 2018 16:01:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?leveL=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAlevel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index b9e147af0..cb2d8dbe8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -174,12 +174,12 @@ $(function(){
 function hiddenlevel(){
 	var action=$("input[name='action']:checked").val();
 	if(action==16){
-		$(".leveL").addClass("hidden");
+		$(".level").addClass("hidden");
 		$("select[name='level']").find("option").eq(0).attr("value","0");
 		$("select[name='level']").val("0");
 		$("select[name='level']").selectpicker("refresh");
 	}else {
-		$(".leveL").removeClass("hidden");
+		$(".level").removeClass("hidden");
 		$("select[name='level']").find("option").eq(0).attr("value","");
 		$("select[name='level']").val("100");
 		$("select[name='level']").selectpicker("refresh");
@@ -328,7 +328,7 @@ function sampleFileValidate(fileType,fileName){
 							            	 	</c:choose>
 							            </div>
 							            &nbsp;<span id="fileNoteInfo" title="<spring:message code="select_file"/>" 
-							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"> <spring:message code="info"/></span>
+							            class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
 							            <div for="srcFileInfo"></div>
 							            <div id="fileErrorNote"></div>
 							        </div>
@@ -356,7 +356,7 @@ function sampleFileValidate(fileType,fileName){
 							            <div for="sampleFileInfo"></div>
 							        </div>
 							    </div> --%>
-								 <div class="col-md-6 leveL"  >
+								 <div class="col-md-6 level"  >
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
 							            <div class="col-md-6">

From 034b4500fd46848b7391449c4f3db153df4351e2 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Thu, 25 Oct 2018 16:03:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=A0=B7=E4=BE=8B?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E5=BA=A6=E8=B0=83=E6=95=B4=E4=B8=BA=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E6=8B=A6=E6=88=AA=E7=95=8C=E9=9D=A2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  4 +-
 .../WEB-INF/views/cfg/av/switchSignSample.jsp | 42 ++++++++++++++-----
 .../views/cfg/intercept/interceptList.jsp     | 12 +++---
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 15e1e5ac6..df671021b 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -165,7 +165,7 @@ ssl_certificate_monitor=SSL Cert Monitor
 response_header_control=Response Header Control
 ip_website_text_control=IP+Website Keyword Control
 request_task=Letter and Task
-realtime_report=Log Report
+realtime_report=Statistics
 protocol_and_app=Protocol And App
 text_content_monitor=Plaintext
 multimedia=Multimedia
@@ -991,7 +991,7 @@ ip_multiplex_pool_config=IP Reuse Addr Pool
 letter=Official Letter
 show_more=Show More
 #===============dashboard begin===================================
-dashboard=Dashboard
+dashboard=Traffic Statistics
 traffic_chart=Traffic Chart
 os_type=OS Type
 browser_type=Browser Type
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
index f2e12c7c3..b46b28cd5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -16,23 +16,37 @@ $(function(){
 		})
 	}); */
 	if($("#oldAction").val()==1&&$(".action:checked").attr("id")!="actionOff"){
-		$("#level").show();
+		$(".level").removeClass("hidden");
+		$(".level").find("select[name='level']").find("option").eq(0).attr("value","");
+		$(".level").find("select[name='level']").val("100");
+		$(".level").find("select[name='level']").selectpicker("refresh");
 	}else{
-		$("#level").hide();
-		$("input[name$='level']").val(0);
+		$(".level").addClass("hidden");
+		$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
+		$(".level").find("select[name$='level']").val("0");
+		$(".level").find("select[name$='level']").selectpicker("refresh");
 	}
 	$("input[name~=action]").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 		if($(".action:checked").val()==1){
-			$("#level").show();
-			}else{
-			$("#level").hide();
-			}
+			$(".level").removeClass("hidden");
+			$(".level").find("select[name$='level']").find("option").eq(0).attr("value","");
+			$(".level").find("select[name$='level']").val("100");
+			$(".level").find("select[name$='level']").selectpicker("refresh");
+		}else{
+			$(".level").addClass("hidden");
+			$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
+			$(".level").find("select[name$='level']").val("0");
+			$(".level").find("select[name$='level']").selectpicker("refresh");
+		}
 		if($("#level").is(":hidden")){
 			$("input[name$='level']").val(0);
 		}
 		if($(".action:checked").attr("id")=="actionOff"){
-			$("#level").hide();
+				$(".level").addClass("hidden");
+				$(".level").find("select[name$='level']").find("option").eq(0).attr("value","0");
+				$(".level").find("select[name$='='level']").val("0");
+				$(".level").find("select[name$='level']").selectpicker("refresh");
 			}
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -172,13 +186,19 @@ $(function(){
 										<div class="row">
 											<div class="col-md-6">
 										        <div class="form-group ">
-										            <div id="level" class="form-group" hidden="hidden">
+										           <div id="level" class="form-group level hidden" >
 											            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
 											            <div class="col-md-6">
-											            	 <input class="form-control required number" range="[0,100]" type="text" name="cfgs[${status.index }].level" value="${_cfg.level }">
+											            	 <select name="cfgs[${status.index }].level" data-live-search="true" class="selectpicker form-control required">
+																	<option value="0" ><spring:message code="selected"/></option>
+																	<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
+																		<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 100)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
+																	</c:forEach>
+																</select>
 											            </div>
 											        </div>
-										            <div for="cfgs[${status.index }].level"></div>
+											            
+											            <div for="cfgs[${status.index }].level"></div>
 										        </div>
 										    </div>
 										</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index cef5c27ea..3b2d4f4fe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -94,7 +94,7 @@
 </c:if>
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:config">
+		<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:config">
 			<button type="button" class="btn btn-primary"
 				onClick="javascript:window.location='${ctx}/proxy/intercept/intercept${interceptType}Form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
@@ -116,7 +116,7 @@
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>
-		</customTag:hasAnyPermissions>
+		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
@@ -190,12 +190,12 @@
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-							 		<customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:config">
+							 		<shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:config">
 							 			<sys:delRow url="${ctx}/proxy/intercept/intercept${interceptType}Form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/proxy/intercept/updateIntercept${interceptType}Valid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                    	    <sys:delRow url="${ctx}/proxy/intercept/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/${fn:toLowerCase(interceptType)}/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> 
-                                    </customTag:hasAnyPermissions>
-                                    <customTag:hasAnyPermissions name="intercept:ip:config,intercept:domain:config,ip_payload:confirm">
+                                    </shiro:hasPermission>
+                                    <shiro:hasPermission name="intercept:${fn:toLowerCase(interceptType)}:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -207,7 +207,7 @@
 												<li><sys:delRow url="${ctx}/proxy/intercept/auditIntercept${interceptType}Cfg?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
 				                            </ul>
 				                         </div>
-                                    </customTag:hasAnyPermissions>
+                                    </shiro:hasPermission>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>

From 97ae9af60f8ab63c6e3cf71fd8cf098d008a0ef1 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Thu, 25 Oct 2018 16:13:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0description.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/basics/PolicyGroupInfo.java     |  7 +++++++
 .../maintenance/IpMultiplexPoolCfgController.java  |  2 +-
 .../com/nis/web/dao/basics/PolicyGroupInfoDao.xml  | 14 ++++++++++----
 .../WEB-INF/views/basics/policyGroupForm.jsp       | 14 ++++++++++++--
 .../WEB-INF/views/basics/policyGroupList.jsp       |  3 ++-
 .../cfg/maintenance/ipMultiplexPool/snatlist.jsp   | 12 ++++++++++++
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java b/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
index 54c8d8a65..8148b6464 100644
--- a/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
+++ b/src/main/java/com/nis/domain/basics/PolicyGroupInfo.java
@@ -21,6 +21,7 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
 	private String groupName;
 	private Integer groupType;
 	private Integer serviceGroupId;
+	private String description;
 	
 	public Integer getServiceGroupId() {
 		return serviceGroupId;
@@ -58,4 +59,10 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
 	public void setGroupType(Integer groupType) {
 		this.groupType = groupType;
 	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
index 7bc16fcc9..256e3ffa6 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
@@ -131,7 +131,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		//查询时left join policyGroup
 		Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
 		model.addAttribute("page", page);
-		initPageCondition(model,entity);
+		initFormCondition(model,entity);
 		return "/cfg/maintenance/ipMultiplexPool/snatlist";
 	}
 	
diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
index 218d135a8..cfa15196a 100644
--- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
@@ -12,10 +12,11 @@
     <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
     <result column="editor_id" property="editorId" jdbcType="INTEGER" />
     <result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
   </resultMap>
     <sql id="PolicyGroupInfoColumns">
-		r.group_id,r.group_name,r.group_type,r.is_valid,
-		r.create_time,r.edit_time,r.creator_id,r.editor_id,r.service_group_id
+		r.group_id,r.group_name,r.group_type,r.is_valid,r.create_time,
+		r.edit_time,r.creator_id,r.editor_id,r.service_group_id,r.description
 	</sql>
   
    <!-- 查出所有 有效数据-->
@@ -95,14 +96,16 @@
     CREATE_TIME,
     GROUP_NAME,
     GROUP_TYPE,
-    SERVICE_GROUP_ID
+    SERVICE_GROUP_ID,
+    DESCRIPTION
     )values (
     	1,
     	#{creatorId,jdbcType=INTEGER}, 
    		#{createTime,jdbcType=TIMESTAMP},
     	#{groupName,jdbcType=VARCHAR}, 
     	#{groupType,jdbcType=INTEGER},
-    	#{serviceGroupId,jdbcType=INTEGER}
+    	#{serviceGroupId,jdbcType=INTEGER},
+    	#{description,jdbcType=VARCHAR}
     )
   </insert>
   <update id="update" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
@@ -115,6 +118,9 @@
       <if test="groupType != null" >
         group_type = #{groupType,jdbcType=INTEGER},
       </if>
+      <if test="description != null" >
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="isValid != null" >
         is_valid = #{isValid,jdbcType=INTEGER},
       </if>
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
index 3edce7495..63d1f17d8 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
@@ -53,7 +53,7 @@ $(function(){
                   </div>
                   <div class="portlet-body form">
                       <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
+                      <form:form id="cfgFrom" modelAttribute="_cfg" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
                       	<input type="hidden" name="groupId" value="${_cfg.groupId}">
                           <div class="form-body">
                               <div class="row">
@@ -79,6 +79,16 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row">
+									<div class="col-md-6">
+										<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" maxlength="128" class="form-control" />
+											</div>
+										</div>
+									</div>
+								</div>
                           </div>
                           <div class="form-actions">
                               <div class="row">
@@ -93,7 +103,7 @@ $(function(){
                                   <div class="col-md-6"> </div>
                               </div>
                           </div>
-                      </form>
+                      </form:form>
                       <!-- END FORM-->
                   </div>
               </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
index cd72e267d..59cdaf382 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
@@ -216,6 +216,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th><spring:message code="group_name"/></th>
 									<th><spring:message code="group_type"/></th>
+									<th><spring:message code="desc"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -238,7 +239,7 @@
 											<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
 				               			</c:forEach>
 									</td>
-									
+									<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
index 303209335..73691b27d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
@@ -278,6 +278,7 @@
 									<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 									<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="group"/></th>
+									<th><spring:message code="isp"/></th>
 									<th><spring:message code="server_ip"/></th>
 									<%-- <th><spring:message code="port"/></th> --%>
 									<%-- <th><spring:message code="protocol"/></th>
@@ -317,6 +318,17 @@
 											${fns:abbr(cfg.groupName,20)}
 										</a>
 									</td>
+									<td>
+										<c:set value="${cfg.areaEffectiveIds }" var="isp"></c:set>
+										<c:if test="${fn:contains(cfg.areaEffectiveIds,':') }">
+											<c:set value="${fns:substringAfterLast(cfg.areaEffectiveIds,':') }" var="isp"></c:set>
+										</c:if>
+										<c:forEach items="${isps}" var="dict">
+											<c:if test="${dict.itemCode eq isp }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
 									<%-- <td>${cfg.port }</td> --%>
 									<%-- <td>