From 9450df24b5214d62219c5843ade871c64801e05a Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 16 Aug 2018 15:13:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E5=9F=9F=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=90=86=E8=A7=A3HEX=E5=92=8CCase-senstive?=
 =?UTF-8?q?=20=E5=B0=86=E2=80=9C=E6=98=AF=E5=90=A6hex=E4=BA=8C=E8=BF=9B?=
 =?UTF-8?q?=E5=88=B6=E2=80=9D=E5=B1=9E=E6=80=A7=E9=9A=90=E8=97=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E4=BA=8C=E8=BF=9B=E5=88=B6?=
 =?UTF-8?q?=E5=92=8C=E6=98=AF=E5=90=A6=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F?=
 =?UTF-8?q?=E6=84=9F=E4=B8=A4=E4=B8=AA=E9=80=89=E9=A1=B9=EF=BC=8Ccommon.js?=
 =?UTF-8?q?=E4=B8=AD=E6=A0=B9=E6=8D=AE=E7=95=8C=E9=9D=A2=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=9A=84=E2=80=9C=E6=98=AF=E5=90=A6=E4=BA=8C?=
 =?UTF-8?q?=E8=BF=9B=E5=88=B6=E2=80=9C=E5=B1=9E=E6=80=A7=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E3=80=90=E6=B3=A8=EF=BC=9A=E5=8D=81=E5=85=AD=E8=BF=9B=E5=88=B6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F=E6=84=9F?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

其他后期新增的界面，也需要这样处理
---
 .../resources/messages/message_en.properties  |  8 +-
 .../messages/message_zh_CN.properties         |  8 +-
 .../WEB-INF/include/form/stringInfo.jsp       | 71 +++++++++++++----
 .../views/cfg/app/appDomainCfgForm.jsp        | 79 ++++++++++++++-----
 .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp  | 44 +++++++++++
 .../WEB-INF/views/cfg/common/domainForm.jsp   | 75 ++++++++++++++----
 .../WEB-INF/views/cfg/complexCfgForm.jsp      | 40 ++++++++++
 .../WEB-INF/views/cfg/stringCfgForm.jsp       | 40 ++++++++++
 .../webapp/static/global/scripts/common.js    | 45 +++++++++++
 9 files changed, 360 insertions(+), 50 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b9dbebbab..749ea017d 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1043,4 +1043,10 @@ app_desc=Application Description
 tunnel_code=Tunnel Behavior No
 tunnel_name=Tunnel Behavior Name
 tunnel_desc=Tunnel Behavior Description
-call_external_procedures_failed=Call external procedures failed
\ No newline at end of file
+call_external_procedures_failed=Call external procedures failed
+is_hex=Is HEX
+is_case_insenstive=Is Case-senstive
+case_senstive=Case-senstive
+case_insenstive=Case-insenstive
+hex=Hex
+not_hex=Not HEX
\ 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 27bb7b07f..8c7107a74 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1043,4 +1043,10 @@ app_desc=\u793E\u4EA4\u5E94\u7528\u63CF\u8FF0
 tunnel_code=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u5E8F\u53F7
 tunnel_name=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u540D\u79F0
 tunnel_desc=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u63CF\u8FF0
-call_external_procedures_failed=\u8C03\u7528\u5916\u90E8\u7A0B\u5E8F\u51FA\u9519
\ No newline at end of file
+call_external_procedures_failed=\u8C03\u7528\u5916\u90E8\u7A0B\u5E8F\u51FA\u9519
+is_hex=\u662F\u5426\u5341\u516D\u8FDB\u5236
+is_case_insenstive=\u662F\u5426\u5927\u5C0F\u5199\u654F\u611F
+case_senstive=\u5927\u5C0F\u5199\u654F\u611F
+case_insenstive=\u5927\u5C0F\u5199\u4E0D\u654F\u611F
+hex=\u5341\u516D\u8FDB\u5236
+not_hex=\u975E\u5341\u516D\u8FDB\u5236
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index 38cf7c87b..bf3c6b0de 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -15,21 +15,6 @@
 	        </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="whether_hexbinary"/></label>
-	            <div class="col-md-6">
-	            	<select name="isHexbin" class="selectpicker select2 form-control required" >
-						<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-							<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-               			</c:forEach>
-					</select>
-	            </div>
-	            <div for="isHexbin"></div>
-	        </div>
-	    </div>
-	</div>
-	<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">
@@ -47,6 +32,8 @@
 	            <div for="exprType"></div>
 	        </div>
 	    </div>
+	</div>
+	<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="match_method"/></label>
@@ -60,6 +47,60 @@
 	            <div for="matchMethod"></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_hex"/></label>
+	            <div class="col-md-6">
+	            	<label class="radio-inline">
+	            		<input type="radio" name="isHex" value="1" class="required"
+	            			<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
+	            		><spring:message code="hex"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="isHex" value="0" class="required"
+	            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+	            		><spring:message code="not_hex"/>
+	            	</label>
+	            </div>
+	            <div for="isHex"></div>
+	        </div>
+	    </div>
+	    
+	</div>
+	<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="is_case_insenstive"/></label>
+	            <div class="col-md-6">
+	            	<label class="radio-inline">
+	            		<input type="radio" name="isCaseSenstive" value="1" class="required"
+	            			<c:if test="${_cfg.isHexbin==1}">checked</c:if>
+	            		><spring:message code="case_senstive"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+	            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+	            		><spring:message code="case_insenstive"/>
+	            	</label>
+	            </div>
+	            <div for="isCaseInsenstive"></div>
+	        </div>
+	    </div>
+	</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:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+							<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+               			</c:forEach>
+					</select>
+	            </div>
+	            <div for="isHexbin"></div>
+	        </div>
+	    </div>
 	    
 	</div>
 </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 2bc1a5535..0fa08d859 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -152,24 +152,6 @@ $(function(){
 											<div for="domain"></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="whether_hexbinary" /></label>
-											<div class="col-md-6">
-												<select name="isHexbin"
-													class="selectpicker select2 form-control required">
-													<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-													</c:forEach>
-												</select>
-											</div>
-											<div for="isHexbin"></div>
-										</div>
-									</div>
-								</div>
-								<div class="row">
-									
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><font color="red">*</font>
@@ -190,6 +172,50 @@ $(function(){
 											<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="is_hex"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="1" class="required"
+										            			<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
+										            		><spring:message code="hex"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="0" class="required"
+										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+										            		><spring:message code="not_hex"/>
+										            	</label>
+										            </div>
+										            <div for="isHex"></div>
+										        </div>
+										    </div>
+	     
+										</div>
+										<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="is_case_insenstive"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="1" class="required"
+										            			<c:if test="${_cfg.isHexbin==1}">checked</c:if>
+										            		><spring:message code="case_senstive"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+										            		><spring:message code="case_insenstive"/>
+										            	</label>
+										            </div>
+										            <div for="isCaseInsenstive"></div>
+										        </div>
+										    </div>
+	     
+										</div>
+								<div class="row">
+									
 									<div class="col-md-6">
 										<div class="form-group ">
 											<label class="control-label col-md-3"><font color="red">*</font>
@@ -207,6 +233,23 @@ $(function(){
 									</div>
 								</div>
 							</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:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+													</c:forEach>
+												</select>
+											</div>
+											<div for="isHexbin"></div>
+										</div>
+									</div>
+							</div>
                            <input name="isAreaEffective" type="hidden" value="0">
                            <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
 							<input name="requestId" value="0" type="hidden">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 5c229ec28..8a0a63e1a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -229,6 +229,49 @@ $(function(){
 											<div for="matchMethod"></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_hex"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="1" class="required"
+										            			<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
+										            		><spring:message code="hex"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="0" class="required"
+										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+										            		><spring:message code="not_hex"/>
+										            	</label>
+										            </div>
+										            <div for="isHex"></div>
+										        </div>
+										    </div>
+	     
+										</div>
+										<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="is_case_insenstive"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="1" class="required"
+										            			<c:if test="${_cfg.isHexbin==1}">checked</c:if>
+										            		><spring:message code="case_senstive"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+										            		><spring:message code="case_insenstive"/>
+										            	</label>
+										            </div>
+										            <div for="isCaseInsenstive"></div>
+										        </div>
+										    </div>
+	     
+										</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>
@@ -244,6 +287,7 @@ $(function(){
 											<div for="isHexbin"></div>
 										</div>
 									</div>
+									
 								</div> 
 							</div> 
                          <input name="isAreaEffective" type="hidden" value="0">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index 938565b01..ce533d4c3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -162,21 +162,6 @@
 										        </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="whether_hexbinary"/></label>
-										            <div class="col-md-6">
-										            	<select name="isHexbin" class="selectpicker select2 form-control required" >
-															<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-																<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-									               			</c:forEach>
-														</select>
-										            </div>
-										            <div for="isHexbin"></div>
-										        </div>
-										    </div>
-										</div>
-										<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">
@@ -194,6 +179,9 @@
 										            <div for="exprType"></div>
 										        </div>
 										    </div>
+										</div>
+										<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="match_method"/></label>
@@ -211,6 +199,63 @@
 										            <div for="matchMethod"></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_hex"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="1" class="required"
+										            			<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
+										            		><spring:message code="hex"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="0" class="required"
+										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+										            		><spring:message code="not_hex"/>
+										            	</label>
+										            </div>
+										            <div for="isHex"></div>
+										        </div>
+										    </div>
+	     
+										</div>
+										<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="is_case_insenstive"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="1" class="required"
+										            			<c:if test="${_cfg.isHexbin==1}">checked</c:if>
+										            		><spring:message code="case_senstive"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+										            			<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
+										            		><spring:message code="case_insenstive"/>
+										            	</label>
+										            </div>
+										            <div for="isCaseInsenstive"></div>
+										        </div>
+										    </div>
+	     
+										</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:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+																<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+									               			</c:forEach>
+														</select>
+										            </div>
+										            <div for="isHexbin"></div>
+										        </div>
+										    </div>
 										</div>
 										<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
 											<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 4039242f0..3175e1b12 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -93,6 +93,46 @@
 	</div>
 </div>
 <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="is_hex"/></label>
+	            <div class="col-md-6">
+	            	<label class="radio-inline">
+	            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
+	            			<c:if test="${complexCfg.isHexbin eq 1}">checked</c:if>
+	            		><spring:message code="hex"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
+	            			<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
+	            		><spring:message code="not_hex"/>
+	            	</label>
+	            </div>
+	            <div for="${cfgName}.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="${cfgName}.isCaseSenstive" value="1" class="required"
+	            			<c:if test="${complexCfg.isHexbin==1}">checked</c:if>
+	            		><spring:message code="case_senstive"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
+	            			<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
+	            		><spring:message code="case_insenstive"/>
+	            	</label>
+	            </div>
+	            <div for="${cfgName}.isCaseInsenstive"></div>
+	        </div>
+	    </div>
+	    
+	</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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 85b76ac44..18f717671 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -77,6 +77,46 @@ $(function(){
 	</div>
 </div>
 <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="is_hex"/></label>
+	            <div class="col-md-6">
+	            	<label class="radio-inline">
+	            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
+	            			<c:if test="${strCfg.isHexbin eq 1}">checked</c:if>
+	            		><spring:message code="hex"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
+	            			<c:if test="${strCfg.isHexbin ne 1}">checked</c:if>
+	            		><spring:message code="not_hex"/>
+	            	</label>
+	            </div>
+	            <div for="${cfgName}.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="${cfgName}.isCaseSenstive" value="1" class="required"
+	            			<c:if test="${strCfg.isHexbin==1}">checked</c:if>
+	            		><spring:message code="case_senstive"/>
+	            	</label>
+	            	<label class="radio-inline">
+	            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
+	            			<c:if test="${strCfg.isHexbin ne 1}">checked</c:if>
+	            		><spring:message code="case_insenstive"/>
+	            	</label>
+	            </div>
+	            <div for="${cfgName}.isCaseInsenstive"></div>
+	        </div>
+	    </div>
+	    
+	</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>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 3e556904a..27088d2af 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,4 +1,13 @@
 $(function(){
+	$("input[name$='isHex']").on("change",function(){
+	   setIsHexBin(this);
+	});
+	$("input[name$='isCaseSenstive']").on("change",function(){
+		setIsHexBin(this);
+	});
+	$("input[name$='isHex']:checked").each(function(){
+		setIsHexBin(this);
+	});
 	$("a[name=viewLogInfo]>i").on("click",function(){
 		var html = "<div class='logInfo'>";
 		$(this).parents("tr").find("td").each(function(index,element){
@@ -427,6 +436,41 @@ window.onload=function(){
 	
 }
 
+//0 非十六进制 大小不敏感 1 十六进制，大小写不敏感 2非十六进制 大小写敏感
+var setIsHexBin=function(obj){
+	var profix="";
+	if($(obj).attr("name").indexOf(".") > -1){
+		profix=$(obj).attr("name").substring(0,$(obj).attr("name").indexOf(".")+1);
+	}
+	console.log($(obj).attr("name"));
+	console.log(profix);
+	var isHex=$("input[name='"+profix+"isHex']:checked").val();
+	//如果选择十六进制，则必须发小写不敏感
+	if(isHex == 1){
+		$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",true);
+		$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",false);
+		$("input[name='"+profix+"isCaseSenstive'][value=1]").parent().addClass("hidden");
+	}else{
+		$("input[name='"+profix+"isCaseSenstive'][value=1]").parent().removeClass("hidden");
+	}
+	var isCaseSenstive=$("input[name='"+profix+"isCaseSenstive']:checked").val();
+	//设置isHexbin下拉框的值
+	if(isHex == 0 && isCaseSenstive==0){
+		$("select[name='"+profix+"isHexbin']").find("option").prop("selected","");
+		$("select[name='"+profix+"isHexbin']").find("option[value=0]").prop("selected","selected");
+	}
+	if(isHex == 1 && isCaseSenstive==0){
+		$("select[name='"+profix+"isHexbin']").find("option").prop("selected","");
+		$("select[name='"+profix+"isHexbin']").find("option[value=1]").prop("selected","selected");
+	}
+	if(isHex == 0 && isCaseSenstive==1){
+		$("select[name='"+profix+"isHexbin']").find("option").prop("selected","");
+		$("select[name='"+profix+"isHexbin']").find("option[value=2]").prop("selected","selected");
+	}
+	if($("select[name='"+profix+"isHexbin']").val() == ""){
+		$("select[name='"+profix+"isHexbin']").find("option[value=0]").prop("selected","selected");
+	}
+}
 //选择hex cfgkeywords需校验十六进制
 var addHexCheck=function(obj,isHexbin){
 	if(isHexbin == 1){ //十六进制
@@ -440,6 +484,7 @@ var addHexCheck=function(obj,isHexbin){
 //与表达式时，只允许为子串匹配
 var setDefaultMatchMethod=function (obj){
 	var exprType = $(obj).val();
+	console.log($(obj).parents(".row").parent(".row"));
 	if(exprType == 1){
 		$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option").removeAttr("selected");
 		$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option[value=0]").attr("selected","selected");