ssl的配置详情isHexbin拆分

删除sql增加视频场景删除和增加
app和隧道行为的exprTypebug更改

src/main/resources/sql/truncate_tables.sql

@@ -23,6 +23,9 @@ DELETE FROM av_voip_account_cfg;
 DELETE FROM av_voip_ip_cfg;
 DELETE FROM byte_features_cfg;
 DELETE FROM cfg_index_info;
+DELETE FROM av_sign_sample_cfg;
+#视频场在数据库预置一条compileId为0数据
+INSERT INTO `av_sign_sample_cfg` VALUES ('10022', '1', '1', '0', '0', '16', '1', null, '0', '2018-09-06 15:56:53', null, null, '158', '2018-09-13 16:43:54', '266', '0', '0', '0', '0', '0', '0', '0', '33', '0', '0');
 DELETE FROM complex_keyword_cfg;
 #慎重清理config_group_info！ 特定服务新增的时候会预制组号，清理之后组号找不到会影响下发
 #DELETE FROM config_group_info;

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp

@@ -81,9 +81,9 @@ $(function(){
 				$(".disabled").each(function(){
 					$(this).remove();
 				});
-				$("input[name$='exprType']").attr("disabled",false);
+				$("input[name='exprType']").attr("disabled",false);
 				if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
-					$("input[name$='exprType']").val(1);
+					$("input[name='exprType']").val(1);
 				}
 				if($("input[name='ratelimit']").is(":hidden")){
 					$("input[name='ratelimit']").val("");

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp

@@ -69,9 +69,9 @@ $(function(){
 				$(".disabled").each(function(){
 					$(this).remove();
 				});
-				$("input[name$='exprType']").attr("disabled",false);
+				$("input[name='exprType']").attr("disabled",false);
 				if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
-					$("input[name$='exprType']").val(1);
+					$("input[name='exprType']").val(1);
 				}
 				if($("input[name='ratelimit']").is(":hidden")){
 					$("input[name='ratelimit']").val("");

src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp

@@ -254,18 +254,72 @@
 							</div>
 						</div>
 						</div>
+						<c:if test="${cfg.isHexbin==0 }">
 						<div class="row">
-						<div class="col-md-4">
+							<div class="col-md-4">
-							<div class="form-group">
+								<div class="form-group">
-								<label><spring:message code='whether_hexbinary' />:</label>
+									<label><spring:message code="is_hex"/>:</label>
-								<label>
+									<label>
-									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<spring:message code="not_hex"/>
-										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</label>
-									</c:forEach>
+								</div>
-								</label>
 							</div>
 						</div>
-					</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
 				</div>
 			</c:if>
 		</c:forEach>

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js

@@ -64,6 +64,14 @@
 		specServiceCodeCheck:"Повторяющийся номер протокола",
 		compareDate:"Время окончания нельзя раньше времени начала",
 		hexCheck:"Введите шестнадцатеричный символ",
-		invisibleChar:"Введите видимые символы"
+		invisibleChar:"Введите видимые символы",
+		hasInvisibleChar:"The tag {0} has invisible character",
+		haveInvisibleChar:"The tags {0} have invisible character",
+		httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
+		failed:"Failed",
+		go_back:"Go Back Policies",
+		log_5_minutes:"Log For The Last Five Minutes",
+		log_1_hour:"Log For The Last Hour",
+		input:"Please Enter  "
 	});
 }(jQuery));