DNAT复用策略增加用户和用户类型

调整SNAT地址池管理 配置IP的格式为：IP sql提交

src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java

@@ -40,7 +40,7 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{
 	
 	@Expose
 	@SerializedName("translatedDestIp")
-	@ExcelField(title="translated_dest_ip",sort=6)
+	//@ExcelField(title="translated_dest_ip",sort=6)
 	private String destIpAddress;
 	
 	@Expose
@@ -54,8 +54,31 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{
 	@Expose
 	@SerializedName("effectiveRange")
 	private String areaEffectiveIds;
+	@ExcelField(title="user",sort=10)
+	@Expose
+	private String translatedUserId;
+	@Expose
+	@ExcelField(title="user_type",sort=9)
+	private String translatedUserType;
 	
 	
+	
+	public String getTranslatedUserId() {
+		return translatedUserId;
+	}
+
+	public void setTranslatedUserId(String translatedUserId) {
+		this.translatedUserId = translatedUserId;
+	}
+
+	public String getTranslatedUserType() {
+		return translatedUserType;
+	}
+
+	public void setTranslatedUserType(String translatedUserType) {
+		this.translatedUserType = translatedUserType;
+	}
+
 	public String getIndexTable() {
 		return indexTable;
 	}

src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java

@@ -36,7 +36,7 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
 	
 	private Integer ipType;
 	private Integer ipPattern;
-	@ExcelField(title="ip",sort=6)
+	//@ExcelField(title="ip",sort=6)
 	private String srcIpAddress;
 	private String destIpAddress;
 	@Expose

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -343,6 +343,10 @@ public class IpMultiplexController extends CommonController {
 
 		Page<BaseIpCfg> page = ipMultiplexService.findPageDnat(new Page<BaseIpCfg>(request, response, "r"), cfg);
 		model.addAttribute("page", page);
+
+		// 获取用户信息 地址池信息
+		List<UserManage> users = userManageService.findUsers();
+		model.addAttribute("users", users);
 		initFormCondition(model, cfg);
 
 		return "/cfg/manipulation/ipmulitiplex/dnatPolicyList2";
@@ -363,6 +367,10 @@ public class IpMultiplexController extends CommonController {
 		} else {
 			initFormCondition(model, cfg);
 		}
+
+		// 获取用户信息 地址池信息
+		List<UserManage> users = userManageService.findUsers();
+		model.addAttribute("users", users);
 		model.addAttribute("_cfg", cfg);
 		return "/cfg/manipulation/ipmulitiplex/dnatPolicyForm2";
 	}
@@ -581,7 +589,14 @@ public class IpMultiplexController extends CommonController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				
+				IpReuseDnatPolicyCfg dnat=(IpReuseDnatPolicyCfg) cfg;
+				if(dnat.getTranslatedUserType().equals("VPN")){
+					dnat.setTranslatedUserType(msgProp.getProperty("policy_vpn_user","VPN"));
+				}else if(dnat.getTranslatedUserType().equals("SIPv4")){
+					dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv4_user","SIPv4"));
+				}else if(dnat.getTranslatedUserType().equals("SIPv6")){
+					dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv6_user","SIPv6"));
+				}
 			}
 			StringBuilder serviceIds=new StringBuilder(",");
 			for (Integer id : set) {

src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml

@@ -45,7 +45,7 @@
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
 	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
-	    <result column="translated_dest_ip" property="destIpAddress" jdbcType="VARCHAR" />
+	   <!--  <result column="translated_dest_ip" property="destIpAddress" jdbcType="VARCHAR" /> -->
 	    <result column="original_dest_ip" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="translated_dest_port" property="destPort" jdbcType="VARCHAR" />
 	    <result column="original_dest_port" property="srcPort" jdbcType="VARCHAR" />
@@ -73,6 +73,9 @@
 	    <result column="function_id" property="functionId" jdbcType="INTEGER" />
 	    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
 	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+	    
+	    <result column="translated_user_type" property="translatedUserType" jdbcType="VARCHAR" />
+	    <result column="translated_user_id" property="translatedUserId" jdbcType="VARCHAR" />
   	</resultMap>
 	
 	<sql id="policyColumns">
@@ -86,11 +89,11 @@
 	
 	<sql id="dnatPolicyColumns" >
 	    a.cfg_id,a.cfg_desc,a.ip_type,a.original_dest_ip,a.ip_pattern,a.port_pattern,a.original_dest_port,
-	    a.protocol,a.protocol_id,a.cfg_type,a.action,a.translated_dest_port,a.translated_dest_ip,a.is_valid,
+	    a.protocol,a.protocol_id,a.cfg_type,a.action,a.translated_dest_port,a.is_valid,
 	    a.is_audit,a.creator_id,a.create_time,a.editor_id,a.edit_time,a.auditor_id,a.audit_time,
 	    a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
 	    a.area_effective_ids,a.function_id,a.cfg_region_code,a.user_region1,a.user_region2,
-		a.user_region3,a.user_region4,a.user_region5
+		a.user_region3,a.user_region4,a.user_region5,a.translated_user_type,a.translated_user_id
   	</sql>
 	
 	<select id="findPage" resultMap="policyMap">
@@ -438,7 +441,7 @@
 			port_pattern,
 			original_dest_ip,
 			original_dest_port,
-			translated_dest_ip, 
+			<!-- translated_dest_ip,  -->
 			translated_dest_port,
 			protocol,
     		protocol_id,
@@ -467,7 +470,9 @@
     		user_region2,
     		user_region3,
     		user_region4,
-    		user_region5
+    		user_region5,
+    		translated_user_type,
+    		translated_user_id
   		)VALUES (
 			#{cfgDesc,jdbcType=VARCHAR},
     		#{ipType,jdbcType=INTEGER}, 
@@ -475,7 +480,7 @@
     		#{portPattern,jdbcType=INTEGER},
     		#{srcIpAddress,jdbcType=VARCHAR},
     		#{srcPort,jdbcType=VARCHAR},
-    		#{destIpAddress,jdbcType=VARCHAR},
+    		<!--  #{destIpAddress,jdbcType=VARCHAR}, -->
     		#{destPort,jdbcType=VARCHAR},
 		    #{protocol,jdbcType=INTEGER},
 		    #{protocolId,jdbcType=INTEGER},
@@ -504,7 +509,9 @@
 		  	#{userRegion2,jdbcType=VARCHAR},
 		  	#{userRegion3,jdbcType=VARCHAR},
 		  	#{userRegion4,jdbcType=VARCHAR},
-		  	#{userRegion5,jdbcType=VARCHAR}
+		  	#{userRegion5,jdbcType=VARCHAR},
+		  	#{translatedUserType,jdbcType=VARCHAR},
+		  	#{translatedUserId,jdbcType=VARCHAR}
     	)
 	</insert>
 	
@@ -527,9 +534,9 @@
     	  <if test="srcIpAddress != null">
     		original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR},
     	  </if>
-    	  <if test="destIpAddress != null and destIpAddress != ''">
+    	  <!--  <if test="destIpAddress != null and destIpAddress != ''">
     		translated_dest_ip=#{destIpAddress,jdbcType=VARCHAR},
-    	  </if>
+    	  </if>  -->
     	  <if test="srcPort != null and srcPort !=''">
     		original_dest_port=#{srcPort,jdbcType=VARCHAR},
     	  </if>
@@ -587,6 +594,12 @@
 	      <if test="areaEffectiveIds != null" >
 	        area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR},
 	      </if>
+	      <if test="translatedUserType != null and translatedUserType != ''">
+    		translated_user_type=#{translatedUserType,jdbcType=VARCHAR},
+    	  </if>
+    	  <if test="translatedUserId != null and translatedUserId != ''">
+    		translated_user_id=#{translatedUserId,jdbcType=VARCHAR},
+    	  </if>
 	      </trim>
 	    </set>
 	    WHERE cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -628,9 +641,9 @@
 	   		<if test="srcIpAddress != null and srcIpAddress != ''">
     			AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR}
     	  	</if>
-    	  	<if test="destIpAddress != null and destIpAddress != ''">
+    <!-- 	  	<if test="destIpAddress != null and destIpAddress != ''">
     			AND a.translated_dest_ip=#{destIpAddress,jdbcType=VARCHAR}
-    	  	</if>
+    	  	</if> -->
     	 	<if test="srcPort != null and srcPort !=''">
     			AND a.original_dest_port=#{srcPort,jdbcType=VARCHAR}
     	  	</if>
@@ -657,7 +670,7 @@
 	    	</if>
 	    	<if test="auditorName != null and auditorName != ''">
 	    		AND a.AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    	</if>
+	    	</if> 
 	    	<if test="serviceId != null">
 	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
 	    	</if>
@@ -676,6 +689,9 @@
 	    	<if test="lable != null and lable != ''">
 	    		AND a.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
 	    	</if>
+	    	<if test="translatedUserId != null and translatedUserId != ''">
+	   			AND a.translated_user_id LIKE concat(concat('%',#{translatedUserId,jdbcType=VARCHAR}),'%')
+			</if>
 	    	<if test="functionId != null">
 	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>

src/main/resources/sql/20190110/update_region_dict.sql

@@ -0,0 +1,2 @@
+#<23><><EFBFBD><EFBFBD>SNAT<41><54>ַ<EFBFBD>ع<EFBFBD><D8B9><EFBFBD> IP<49>ĸ<EFBFBD>ʽΪ<CABD><CEAA>IP
+update function_region_dict set config_ip_pattern='3' where dict_id='231';

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp

@@ -149,9 +149,10 @@ var resetIndex = function(){
 								            	<c:forEach items="${serviceList}" var="service" varStatus="satus">
 													<label class="radio-inline"> 
 														<c:if test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
+															<input type="radio" name="action"  class="action"
 																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
+																configDolog="${service.configDoLog }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -176,6 +177,32 @@ var resetIndex = function(){
 									</div>
 								</div>
 								
+										<!-- dolog begin-->
+								
+								<div class="row doLog">
+									<div class="col-md-6 hidden">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+													<c:choose>
+														<c:when test="${dict.itemCode eq _cfg.doLog}">
+															<label class="radio-inline">
+														<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+											</c:forEach>
+										</div>
+									</div>
+								</div>
+								
+								<!-- dolog end-->
+								
 								<h4 class="form-section">
 									<spring:message code="address_pool_ip_configuration" />
 									<small>
@@ -227,7 +254,7 @@ var resetIndex = function(){
 									</div>
 									
 									<div class="row ip">
-										<div class="col-md-6">
+										<div class="col-md-6 hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
 									            <div class="col-md-6">
@@ -371,7 +398,7 @@ var resetIndex = function(){
 									</div>
 									
 									<div class="row ip">
-										<div class="col-md-6">
+										<div class="col-md-6 hidden" >
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
 									            <div class="col-md-6">

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp

@@ -401,7 +401,6 @@
 									<th column="address_pool"  class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
 									<th column="ip_total"  class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
 									<th column="available_ip_total" ><spring:message code="available_ip_total"/></th>
-									
 									<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>
 									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="is_audit" ><spring:message code="is_audit"/></th>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp

@@ -90,7 +90,7 @@ $(function(){
 								        </div>
 								    </div>
 								    <c:if test="${fn:length(serviceList)>1}">
-									    <div class="col-md-6">
+									    <div class="col-md-6"> 
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><spring:message code="action"/></label>
 									            <div class="col-md-6">
@@ -201,7 +201,7 @@ $(function(){
 									    </div>
 									</div>
 									<div class="row port">
-									    <div class="col-md-6">
+									    <%-- <div class="col-md-6">
 									        <div class="form-group ">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="translated_dest_ip"/></label>
 									            <div class="col-md-6">
@@ -209,7 +209,7 @@ $(function(){
 									            </div>
 									            <div for="destIpAddress"></div>
 									        </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="translated_dest_port"/></label>
@@ -219,6 +219,35 @@ $(function(){
 									            <div for="destPort"></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="user_type"/></label>
+								            <div class="col-md-6">
+								            	<select name="translatedUserType" class="selectpicker show-tick form-control required">
+				               						<%-- <option value=""><spring:message code="select"/></option> --%>
+				               						<option value="VPN" <c:if test="${_cfg.translatedUserType eq 'VPN' }">selected</c:if>><spring:message code="policy_vpn_user"/></option>
+				               						<%-- <option value="SIPv4" <c:if test="${_cfg.userType eq 'SIPv4' }">selected</c:if>><spring:message code="policy_sipv4_user"/></option>
+				               						<option value="SIPv6" <c:if test="${_cfg.userType eq 'SIPv6' }">selected</c:if>><spring:message code="policy_sipv6_user"/></option> --%>
+								                </select>
+								            </div>
+								            <div for="translatedUserId"></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="user"/></label>
+								            <div class="col-md-6">
+								            	<select name="translatedUserId" class="selectpicker show-tick form-control required user" data-live-search="true" data-live-search-placeholder="search">
+				               						<option value="" ><spring:message code="select"/></option>
+				               						<c:forEach items="${users}" var="user">
+														<option value="${user.userName}" <c:if test="${_cfg.translatedUserId eq user.userName }">selected</c:if>><spring:message code="${user.userName}"/></option>
+							              			</c:forEach>
+								                </select>
+								            </div>
+								            <div for="translatedUserType"></div>
+								        </div>
+								    </div>
 									</div>
 									<%-- <div class="row destPort">
 									     <div class="col-md-6">

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp

@@ -19,9 +19,40 @@
 			$("#intype").val("${cfg.destIpAddress}");
 		}else if("${cfg.destPort}"){
 			$("#intype").val("${cfg.destPort}");
+		}else if("${cfg.translatedUserId}"){
+			$("#intype").val("${cfg.translatedUserId}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
+		
+		// 处理用户类型检索条件
+		if($("#seltype").val() == "translatedUserType"){
+			$("#intype").hide();// 隐藏输入框
+			$("#isValid").selectpicker("hide");
+		}else{
+			$("#translatedUserType").selectpicker("hide");
+		}
+		$("#seltype").change(function(){
+			if($(this).val() == "translatedUserType"){
+				$("#intype").hide();// 隐藏输入框
+				$("#intype").val("");// 清空input条件
+				$("#translatedUserType").find("option").removeAttr("selected",false);
+				$("#translatedUserType").selectpicker("refresh");
+				$("#translatedUserType").selectpicker("show");
+				$("#isValid").selectpicker("hide");
+			}else if($(this).val() == "isValid"){
+				$("#translatedUserType").find("option:first").attr("selected",true);
+				$("#translatedUserType").selectpicker("hide");
+			}else{
+				$("#translatedUserType").find("option:first").attr("selected",true);
+				$("#translatedUserType").selectpicker("hide");// 隐藏下拉框
+			}
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+		
+		
+		
+		
 		$("#seltype").change(function(){
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
 		});
@@ -105,8 +136,10 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="original_dest_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="original_dest_port"></spring:message></form:option>
-												<form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option>
+												<%-- <form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option> --%>
 												<form:option value="destPort"><spring:message code="translated_dest_port"></spring:message></form:option>
+												<form:option value="translatedUserId"><spring:message code="user"></spring:message></form:option>
+												<%-- <form:option value="translatedUserType"><spring:message code="user_type"></spring:message></form:option> --%>
 												<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
@@ -126,6 +159,13 @@
 													<form:option value="1"><spring:message code="yes"/></form:option>
 													<form:option value="0"><spring:message code="no"/></form:option>
 											 </form:select>
+											 
+											  <form:select path="translatedUserType" class="selectpicker select2 input-small" >
+											 		<form:option value=""><spring:message code="select"/></form:option>
+													<form:option value="VPN"><spring:message code="policy_vpn_user"/></form:option>
+				               						<form:option value="SIPv4"><spring:message code="policy_sipv4_user"/></form:option>
+				               						<form:option value="SIPv6"><spring:message code="policy_sipv6_user"/></form:option>
+								             </form:select>
 										 </div>
                                     </div> 
 								</div>
@@ -309,9 +349,11 @@
 									<%-- <th column="block_type"  class="sort-column a.action"><spring:message code="block_type"/></th> --%>
 									<th column="original_dest_ip" ><spring:message code="original_dest_ip"/></th>
 									<th column="original_dest_port" ><spring:message code="original_dest_port"/></th>
-									<th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th>
+									<%-- <th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th> --%>
 									<th column="translated_dest_port" ><spring:message code="translated_dest_port"/></th>
 									<th column="protocol" ><spring:message code="protocol"/></th>
+									<th column="user_type"><spring:message code="user_type"/></th>
+									<th column="user"><spring:message code="user"/></th>
 									<th column="log_total" ><spring:message code="log_total"/></th>
 									
 									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
@@ -348,7 +390,7 @@
 									</td> --%>
 									<td>${indexCfg.srcIpAddress }</td>
 									<td>${indexCfg.srcPort }</td>
-									<td>${indexCfg.destIpAddress }</td>
+									<%-- <td>${indexCfg.destIpAddress }</td> --%>
 									<td>${indexCfg.destPort }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
@@ -357,6 +399,25 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:if test="${indexCfg.translatedUserType eq 'VPN' }">
+											<spring:message code="policy_vpn_user"/>
+										</c:if>
+										<c:if test="${indexCfg.translatedUserType eq 'SIPv4' }">
+											<spring:message code="policy_sipv4_user"/>
+										</c:if>
+										<c:if test="${indexCfg.translatedUserType eq 'SIPv6' }">
+											<spring:message code="policy_sipv6_user"/>
+										</c:if>
+									</td>
+									<td>
+										<c:forEach items="${users }" var="user">
+											<c:if test="${indexCfg.translatedUserId eq user.userName }">
+												<spring:message code="${user.userName }"/>
+											</c:if>
+				              			</c:forEach>
+									</td>
+									
 									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									
 									<%-- <td>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp

@@ -190,10 +190,11 @@ var switchUserType = function(obj){
 														varStatus="satus">
 														<label class="radio-inline"> <c:if
 																test="${_cfg.functionId eq service.functionId}">
-																<input type="radio" name="action"
+																<input type="radio" name="action"  class="action"
 																	serviceId="${service.serviceId }"
 																	protocolId="${service.protocolId }"
 																	regionCode="${service.regionCode }"
+																	configDolog="${service.configDoLog }"
 																	value="${service.action }" class="required action"
 																	<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp

@@ -124,9 +124,9 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
+												<%-- <form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option> --%>
 												<form:option value="userName"><spring:message code="user"></spring:message></form:option>
-												<form:option value="userType"><spring:message code="user_type"></spring:message></form:option>
+												<%-- <form:option value="userType"><spring:message code="user_type"></spring:message></form:option> --%>
 												<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
@@ -329,7 +329,7 @@
 									<th column="address_pool"><spring:message code="address_pool"/></th>
 									<th column="user_type"><spring:message code="user_type"/></th>
 									<th column="user"><spring:message code="user"/></th>
-									<th column="ip"><spring:message code="ip"/></th>
+									<%-- <th column="ip"><spring:message code="ip"/></th> --%>
 									<th column="log_total"><spring:message code="log_total"/></th>
 									<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
 									<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -381,7 +381,7 @@
 											</c:if>
 				              			</c:forEach>
 									</td>
-									<td>${indexCfg.srcIpAddress }</td>
+									<%-- <td>${indexCfg.srcIpAddress }</td> --%>
 									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									
 									<%-- <td>