操控增加国际化代码，修改列表action检索

src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java

@@ -326,9 +326,9 @@ public class ManipulatPolicyController extends BaseController {
 				BeanUtils.copyProperties(source, str);
 				
 				if(str.getUserRegion5().equals("85")) {
-					str.setActionExport("Hijack");
+					str.setActionExport("action_hijack");
 				}else if(str.getUserRegion5().equals("90")) {
-					str.setActionExport("Insert");
+					str.setActionExport("action_insert");
 				}else {
 					str.setActionExport(str.getUserRegion5());
 				}

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

@@ -189,6 +189,9 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="userRegion5 != null and userRegion5 != ''">
+	    		AND a.USER_REGION5=#{userRegion5,jdbcType=VARCHAR}
+	    	</if>
 	    	<choose>
 	    		<!-- 判断是否批量操作 -->
 				<when test="batchValidValue != null and batchValidValue != ''">

src/main/resources/messages/message_en.properties

@@ -1579,3 +1579,7 @@ enable=Enable
 forward=Forward
 decrypt_mirror_enable_on=if the enable option value is '1', the Mirror profile is needed
 ssl_ver_mirror_client_on=if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored
+profile_info=Profile Info
+http_manipulation=HTTP(S) Manipulate
+action_hijack=Hijack
+action_insert=Insert

src/main/resources/messages/message_ru.properties

@@ -1581,3 +1581,7 @@ enable=Enable
 forward=Forward
 decrypt_mirror_enable_on=if the enable option value is '1', the Mirror profile is needed
 ssl_ver_mirror_client_on=if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored
+profile_info=Profile Info
+http_manipulation=HTTP(S) Manipulate
+action_hijack=Hijack
+action_insert=Insert

src/main/resources/messages/message_zh_CN.properties

@@ -1543,7 +1543,7 @@ target_name=\u76EE\u6807\u540D\u79F0
 traffic_mirror_address=\u6D41\u91CF\u8F6C\u53D1\u76EE\u7684\u5730\u5740
 content_name=\u5185\u5BB9\u540D\u79F0
 visit_response_page=\u8BBF\u95EE\u963B\u65AD\u9875\u9762
-none_profile_tip=Please Choose Profile Info!
+none_profile_tip=\u8BF7\u9009\u62E9\u6587\u4EF6!
 #---------------------------pxy intercept------------------------------------
 min_should_less_than_max=\u6700\u5C0FSSL\u7248\u672C\u5E94\u5C0F\u4E8E\u6700\u5927SSL\u7248\u672C
 exclusions_ev_cert=\u6392\u9664EV\u8BC1\u4E66
@@ -1579,3 +1579,7 @@ enable=\u542F\u7528
 forward=Forward
 decrypt_mirror_enable_on=\u5982\u679C\u542F\u52A8\u9009\u9879\u7684\u503C\u662F1\uFF0C\u5219\u955C\u50CF\u6587\u4EF6\u9009\u9879\u9700\u8981\u9009\u62E9
 ssl_ver_mirror_client_on=\u5982\u679C\u955C\u50CF\u5BA2\u6237\u7AEF\u9009\u9879\u7684\u503C\u662F1\uFF0C\u5219\u6700\u5927\u6700\u5C0FSSL\u7248\u672C\u53F7\u4F1A\u88AB\u5FFD\u7565
+profile_info=\u6587\u4EF6
+http_manipulation=HTTP(S)\u64CD\u63A7
+action_hijack=\u52AB\u6301
+action_insert=\u6CE8\u5165

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -109,11 +109,11 @@
 									</c:forEach>
 									<label class="radio-inline"><%-- HiJack标识为85 --%>
 										<input type="radio" name="manipulatType" class="userRegion5" value="85" class="required">
-										<spring:message code="HiJack"/>
+										<spring:message code="action_hijack"/>
 									</label>
 									<label class="radio-inline"><%-- Insert标识为90 --%>
 										<input type="radio" name="manipulatType" class="userRegion5" value="90" class="required">
-										<spring:message code="Insert"/>
+										<spring:message code="action_insert"/>
 									</label>
 								</div>
 								<div for="manipulatType"></div>

src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyForm.jsp

@@ -118,7 +118,6 @@
 			$(this).removeAttr("disabled");
 		});
 		$("select[name='httpResHdrList[0].district']").selectpicker("refresh");
-		$("select[name='httpResHdrList[0].district']").change();
 		
 		// 域配置隐藏/显示
 		if(selValue == 48){ 						// Redirect 隐藏响应体
@@ -327,13 +326,13 @@
 												<label class="radio-inline">
 													<input type="radio" name="userRegion5" class="userRegion5" value="85" class="required"
 														<c:if test="${_cfg.userRegion5 == 85}">checked</c:if>>
-													<spring:message code="HiJack"/>
+													<spring:message code="action_hijack"/>
 												</label>
 												<%-- Insert标识为90 --%>
 												<label class="radio-inline">
 													<input type="radio" name="userRegion5" class="userRegion5" value="90" class="required"
 														<c:if test="${_cfg.userRegion5 == 90}">checked</c:if>>
-													<spring:message code="Insert"/>
+													<spring:message code="action_insert"/>
 												</label>
 											</div>
 											<div for="userRegion5"></div>

src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp

@@ -204,11 +204,19 @@
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
                                   		 <div class="input-group-btn">
-	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
+	                                  		 <form:select id="actionSelect" path="userRegion5" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
-													<c:forEach items="${serviceList}" var="service">
+													<%-- <c:forEach items="${serviceList}" var="service">
 														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													</c:forEach> --%>
+													
+													<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+														<c:if test="${dict.itemCode == 16 || dict.itemCode == 48 || dict.itemCode == 80 }">
+															<form:option value="${dict.itemCode }"><spring:message code="${dict.itemValue }"/></form:option>
+														</c:if>
 													</c:forEach>
+													<form:option value="85"><spring:message code="action_hijack"/></form:option>
+													<form:option value="90"><spring:message code="action_insert"/></form:option>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
@@ -429,10 +437,10 @@
 											</c:if>
 										</c:forEach>
 										<c:if test="${indexCfg.userRegion5 eq 85 }">
-											<spring:message code="HiJack"/>
+											<spring:message code="action_hijack"/>
 										</c:if>
 										<c:if test="${indexCfg.userRegion5 eq 90 }">
-											<spring:message code="Insert"/>
+											<spring:message code="action_insert"/>
 										</c:if>
 									</td>
 									

src/main/webapp/static/global/scripts/common.js

@@ -547,8 +547,9 @@ $(function(){
    
    //处理增强字符串配置的匹配区域
    $(".district").each(function(){
-		if($(this).siblings(".otherValue").val()!=''){
-			if($(this).val()!=$(this).siblings(".otherValue").val()){
+	   var otherVal = $(this).siblings(".otherValue").val();
+	   if(otherVal != '' && typeof otherVal != 'undefined'){
+		   	if($(this).val() != otherVal){
 				$(this).find("option[value=others]").attr("selected","selected");
 				$(this).siblings(".otherValue").prop("type","text");
 			}

src/main/webapp/static/pages/scripts/importExcel.js

@@ -174,6 +174,7 @@ var importCfg=function(){
 	}
  	
 	// 代理-操控业务Profile Info
+	if($("#functionId").val() == 215){
 		if($("#profileSelId").val() == "" || $("#profileSelId").val() == null){
 			$("span",$error).html($("#noneProfileTip").val());
 			$error.removeClass("hide");
@@ -181,6 +182,8 @@ var importCfg=function(){
 			return false;
 		}
 		
+	}
+	
  	if(fileName==""){
  		$("span",$error).html($("#noneFileTip").val());
  		$error.removeClass("hide");