From 6854f82fe109ab0187290ea044f90b2bd33d311c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 26 Aug 2018 16:52:02 +0800
Subject: [PATCH] =?UTF-8?q?appTcp=20=E5=8E=BB=E9=99=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=80=BB=E9=87=8F=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E5=9F=9F=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AppCfgDao.xml   |  18 +-
 .../WEB-INF/views/cfg/app/appTcpCfgForm.jsp   | 204 +-----------------
 .../WEB-INF/views/cfg/app/appTcpCfgList.jsp   |  31 +--
 3 files changed, 19 insertions(+), 234 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 8d97ef21e..675f3b7ee 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -352,9 +352,6 @@
     <result column="classify" property="classify" jdbcType="VARCHAR" />
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
-    <result column="expr_type" property="exprType" jdbcType="INTEGER" />
-    <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
-    <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
@@ -366,7 +363,7 @@
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.low_boundary,r.up_boundary  as upBoundary,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.do_log
+    r.low_boundary,r.up_boundary  as upBoundary,r.do_log
   </sql>
 
 
@@ -1650,11 +1647,11 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    low_boundary,up_boundary,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
+    low_boundary,up_boundary,DO_LOG
     )values (
      <include refid="AppCommonCfg_Value_List" />,
    	#{lowBoundary,jdbcType=INTEGER},#{upBoundary,jdbcType=INTEGER},
-    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+     #{doLog,jdbcType=INTEGER}
     )
   </insert>
   <insert id="insertAppPolicyCfg" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
@@ -2820,15 +2817,6 @@
    	   <if test="upBoundary != null and upBoundary != ''">
    		up_boundary=#{upBoundary,jdbcType=INTEGER},
    	  </if>
-   	  <if test="exprType != null">
-    	expr_type=#{exprType,jdbcType=INTEGER},
-      </if>
-      <if test="matchMethod != null">
-    	match_method=#{matchMethod,jdbcType=INTEGER},
-      </if>
-      <if test="isHexbin != null">
-    	is_hexbin=#{isHexbin,jdbcType=INTEGER},
-      </if>
         <if test="doLog != null">
     	do_log=#{doLog,jdbcType=INTEGER},
       </if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index 9d6585cf4..cea10deeb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -39,7 +39,6 @@ $(function(){
 			}
 			
 			if(flag){
-				$("input[name$='exprType']").attr("disabled",false);
 				$("#appCode").val($("#specServiceIdId").val());
 				loading('onloading...');
 				form.submit();
@@ -140,6 +139,7 @@ $(function(){
 								            <div for="action"></div>
 								       </div>
 									</div>
+								</div>	
 								<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
@@ -160,20 +160,21 @@ $(function(){
 								        </div>
 								    </div>
 								</div>
-									<div class="row  doLog"  style="display: none;">
-									<div class="col-md-6">
-									  <div class="form-group">
+								<!-- dolog begin-->
+								<div class="row " >
+									<div class="col-md-6" hidden="true">
+									<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"  value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+													<input type="radio" name="doLog" checked value="0" ><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}"/>
+													<input type="radio" name="doLog" value="0" ><spring:message code="${dict.itemValue}"/>
 												</label>
 											</c:otherwise>
 										</c:choose>
@@ -181,6 +182,8 @@ $(function(){
 									</div>
 								</div>
 								</div>
+								<!-- dolog end-->
+								
 								<c:forEach items="${regionList}" var="region">
                    				<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
@@ -189,194 +192,7 @@ $(function(){
                    				<input type="hidden" name="exprType" value="0">
                    				<input type="hidden" name="matchMethod" value="0">
                    				<input type="hidden" name="isHexbin" value="0">
-								<%-- <div class="row">
-										<div class="col-md-6">
-											<div class="form-group">
-												<label class="control-label col-md-3"><font color="red">*</font>
-													<spring:message code="expression_type" /></label>
-												<div class="col-md-6">
-													<c:if test="${!empty region.configExprType}">
-														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
-															<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
-																<c:if test="${exprTypeC.itemCode eq exprType}">
-																	<label class="radio-inline"> 
-																		<input type="radio"
-																			name="exprType" value="${exprType }"
-																			class="required"
-																			<c:if test="${_cfg.exprType eq exprType || (empty _cfg.exprType && exprType eq 0)}">
-																				checked
-																			</c:if>
-																		> 
-																		<spring:message	code="${exprTypeC.itemValue }" />
-																	</label>
-																</c:if>
-															</c:forEach>
-														</c:forEach>
-													</c:if>
-													<c:if test="${empty region.configExprType}">
-														<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
-																<c:if test="${exprTypeC.itemCode eq 0}">
-																	<label class="radio-inline"> 
-																		<input type="radio"
-																			name="exprType" value="${exprTypeC.itemCode }"
-																			class="required" checked > 
-																		<spring:message	code="${exprTypeC.itemValue }" />
-																	</label>
-																</c:if>
-															</c:forEach>
-													</c:if>
-												</div>
-												<div for="exprType"></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="match_method" /></label>
-												<div class="col-md-6">
-													<select name="matchMethod"
-														class="selectpicker select2 form-control required">
-														<c:if test="${!empty region.configMatchMethod}">
-															<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
-																<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																	<c:if test="${matchMethodC.itemCode eq matchMethod}">
-																		<option value="${matchMethodC.itemCode}" 
-																		<c:if test="${_cfg.matchMethod eq matchMethod || (empty _cfg.matchMethod && matchMethod eq 0)}">
-																		selected
-																		</c:if>
-																		>
-																		<spring:message code="${matchMethodC.itemValue}"/>
-																		</option>
-																	</c:if>
-																
-																</c:forEach> 
-															</c:forEach>
-														</c:if>
-														<c:if test="${empty region.configMatchMethod}">
-															<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																	<c:if test="${matchMethodC.itemCode eq 0}">
-																		<option value="${matchMethodC.itemCode}" 
-																		selected
-																		>
-																		<spring:message code="${matchMethodC.itemValue}"/>
-																		</option>
-																	</c:if>
-																
-																</c:forEach> 
-														</c:if>
-													</select>
-												</div>
-												<div for="matchMethod"></div>
-											</div>
-										</div>
-								</div>
-								<div class="row">
-										<c:if test="${!empty region.configHex}">
-										    <div class="col-md-6">
-										        <div class="form-group ">
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="1" class="required"
-										            		><spring:message code="hex"/>
-										            	</label>
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="0" class="required"
-										            		><spring:message code="not_hex"/>
-										            	</label>
-										            </div>
-										            <div for="isHex"></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="is_case_insenstive"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isCaseSenstive" value="1" class="required"
-										            		><spring:message code="case_senstive"/>
-										            	</label>
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
-										            		><spring:message code="case_insenstive"/>
-										            	</label>
-										            </div>
-										            <div for="isCaseInsenstive"></div>
-										        </div>
-										    </div>
-								  	</c:if>
-								  	<c:if test="${empty region.configHex}"> 
-										<div class="col-md-6">
-										        <div class="form-group ">
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="0" class="required" checked
-										            		><spring:message code="not_hex"/>
-										            	</label>
-										            </div>
-										            <div for="isHex"></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="is_case_insenstive"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
-										            			checked
-										            		><spring:message code="case_insenstive"/>
-										            	</label>
-										            </div>
-										            <div for="isCaseInsenstive"></div>
-										        </div>
-										    </div>
-									</c:if>
-								</div>
-								<div class="row hidden">
-									<div class="col-md-6">
-										<div class="form-group">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="whether_hexbinary" /></label>
-											<div class="col-md-6">
-												<select name="isHexbin"
-													class="selectpicker select2 form-control required">
-													<c:if test="${!empty region.configHex}">
-														<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
-																<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-																	<c:if test="${isHexbinC.itemCode eq isHexbin}">
-																		<option value="${isHexbinC.itemCode}" 
-																		<c:if test="${_cfg.isHexbin eq isHexbin || (empty _cfg.isHexbin && isHexbin eq 0)}">
-																		selected
-																		</c:if>
-																		>
-																		<spring:message code="${isHexbinC.itemValue}"/>
-																		</option>
-																	</c:if>
-																
-																</c:forEach> 
-														</c:forEach>
-													</c:if>
-													<c:if test="${empty region.configHex}"> 
-													
-														<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-															<c:if test="${isHexbinC.itemCode eq 0}">
-																<option value="${isHexbinC.itemCode}"  selected >
-																<spring:message code="${isHexbinC.itemValue}"/>
-																</option>
-															</c:if>
-														</c:forEach> 
-													
-													</c:if>
-												</select>
-											</div>
-											<div for="isHexbin"></div>
-										</div>
-									</div>
-								</div>
-								</c:if> --%>
-                   		</c:forEach>
+                   		       </c:forEach>
 							</div>
 							<input name="isAreaEffective" type="hidden" value="0">
 							<input name="requestId" value="0" type="hidden">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 308f66b76..8bd278214 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -270,8 +270,8 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
-								    <th><spring:message code="lowBoundary"/></th>
-								    <th><spring:message code="upBoundary"/></th>
+								    <th><spring:message code="min_tcp"/></th>
+								    <th><spring:message code="max_tcp"/></th>
 									<%-- <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
@@ -284,8 +284,8 @@
 									<th><spring:message code="label"/></th> --%>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
-									<th><spring:message code="creator"/></th>
+<%-- 								<th><spring:message code="log_total"/></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>
 									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
@@ -303,25 +303,6 @@
 								    <td>${cfg.appName }</td>
 								    <td>${cfg.lowBoundary }</td>
 								    <td>${cfg.upBoundary }</td>
-								    <%-- <td>
-										<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-											<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td> --%>
 								    <td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
@@ -335,8 +316,8 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
-								    <td>${cfg.creatorName }</td>
+<%-- 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+ --%>								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
 									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>