From 64532a60a5f4e3d70449ae44dd8f42cd6f24adca Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 13:42:18 +0800
Subject: [PATCH] =?UTF-8?q?ip=E7=AE=A1=E6=8E=A7=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E4=BB=B6=E4=BA=BA=E7=AE=A1=E6=8E=A7=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  | 16 ++++
 .../messages/message_zh_CN.properties         | 16 ++++
 .../webapp/WEB-INF/include/form/basicInfo.jsp | 18 ++--
 .../WEB-INF/include/form/complexInfo.jsp      | 44 +++++-----
 .../webapp/WEB-INF/include/form/ipInfo.jsp    | 42 ++++-----
 .../WEB-INF/include/form/stringInfo.jsp       | 54 ++++++------
 .../WEB-INF/views/cfg/stringCfgForm.jsp       |  6 +-
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 88 +++++++++----------
 8 files changed, 158 insertions(+), 126 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index f0c3ceafb..1579ccb35 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -231,4 +231,20 @@ protocol=protocol
 oneway=oneway
 twoway=twoway
 arbitrary=arbitrary
+basic_config=basic configuration
+block_config=block configuration
+expression_type=expression type
+null=null
+and=&
+match_method=match method
+substring_match=substring match
+right_match=right match
+left_match=left match
+exactly_match=exactly match
+whether_hexbinary=whether HEX binary
+hex_binary=HEX binary
+case_insensitive_nohex=case insensitive and no hex
+case_sensitive_nohex=case sensitive and no hex
+area_effect_id=area effect id
+ip_type=ip type
 #==========guankongbaimingdan end=====================
\ 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 7cace7e7d..e113d11de 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -229,4 +229,20 @@ protocol=\u534f\u8bae
 oneway=\u5355\u5411
 twoway=\u53cc\u5411
 arbitrary=\u4efb\u610f
+basic_config=\u57fa\u672c\u914d\u7f6e
+block_config=\u7ba1\u63a7\u914d\u7f6e
+expression_type=\u8868\u8fbe\u5f0f\u7c7b\u578b
+null=\u65e0\u8868\u8fbe\u5f0f
+and=\u4e0e\u8868\u8fbe\u5f0f
+match_method=\u5339\u914d\u65b9\u5f0f
+substring_match=\u5b50\u4e32\u5339\u914d
+right_match=\u53f3\u5339\u914d
+left_match=\u5de6\u5339\u914d
+exactly_match=\u5b8c\u5168\u5339\u914d
+whether_hexbinary=\u662f\u5426hex\u4e8c\u8fdb\u5236
+hex_binary=HEX\u683c\u5f0f\u4e8c\u8fdb\u5236
+case_insensitive_nohex=\u5927\u5c0f\u5199\u4e0d\u654f\u611f\uff0c\u4e14\u975eHEX
+case_sensitive_nohex=\u5927\u5c0f\u5199\u654f\u611f\uff0c\u4e14\u975eHEX
+area_effect_id=\u533a\u57df\u751f\u6548id
+ip_type=ip\u7c7b\u578b
 #==========guankongbaimingdan end=====================
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index 46d5b6533..7dcb11ec5 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -1,13 +1,13 @@
  <%@ page contentType="text/html;charset=UTF-8"%>
  <%@ include file="/WEB-INF/include/taglib.jsp"%>
- <h3 class="form-section">基本配置</h3>
+ <h3 class="form-section"><spring:message code="basic_config"/></h3>
  
 <div class="row">
    <div class="col-md-6">
        <div class="form-group">
-           <label class="control-label col-md-3">来函</label>
+           <label class="control-label col-md-3"><spring:message code="letter"/></label>
            <div class="col-md-6">
-               <select name="requestId" data-live-search="true" data-live-search-placeholder="搜索" class="selectpicker form-control" title="--请选择--">
+               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
                	<c:forEach items="${requestInfos}" var="requestInfo">
                		<option value="${requestInfo.id}"
                		 <c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>
@@ -21,9 +21,9 @@
    <!--/span-->
    <div class="col-md-6">
        <div class="form-group">
-           <label class="control-label col-md-3">分类</label>
+           <label class="control-label col-md-3"><spring:message code="type"/></label>
            <div class="col-md-6">
-           	 <select name="classify" multiple class="selectpicker form-control" title="--请选择--">
+           	 <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                	<c:forEach items="${fls}" var="fl">
                		<c:choose>
                			<c:when test="${_cfg.classify==null or _cfg.classify==''}">
@@ -55,9 +55,9 @@
  <div class="row">
      <div class="col-md-6">
          <div class="form-group">
-             <label class="control-label col-md-3">性质</label>
+             <label class="control-label col-md-3"><spring:message code="attribute"/></label>
              <div class="col-md-6">
-                <select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
+                <select name="attribute" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${xzs}" var="xz">
 	               		<c:choose>
 	               			<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
@@ -79,9 +79,9 @@
      </div>
      <div class="col-md-6">
          <div class="form-group">
-             <label class="control-label col-md-3">标签</label>
+             <label class="control-label col-md-3"><spring:message code="label"/></label>
              <div class="col-md-6">
-                <select name="lable" multiple class="selectpicker form-control" title="--请选择--">
+                <select name="lable" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${lables}" var="lable">
 	               		<c:choose>
 	               			<c:when test="${_cfg.lable==null or _cfg.lable==''}">
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index b720a1281..2018aa0af 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -1,10 +1,10 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section">管控配置</h3>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">配置描述</label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-8">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
@@ -13,7 +13,7 @@
     
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">匹配区域</label>
+            <label class="control-label col-md-3"><spring:message code="match_area"/></label>
             <div class="col-md-8">
             	 <input class="form-control" type="text" name="district" value="${_cfg.district}">
             </div>
@@ -23,7 +23,7 @@
 <div class="row">
 	<div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">关键词</label>
+            <label class="control-label col-md-3"><spring:message code="key_word"/></label>
             <div class="col-md-8">
             	 <input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
             </div>
@@ -48,17 +48,17 @@
     </div> --%>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否区域管控</label>
+            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		>是
+            		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		>否
+            		><spring:message code="no"/>
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
@@ -68,30 +68,30 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">表达式类型</label>
+            <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		>与表达式
+            		><spring:message code="and"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="0"
             			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		>无表达式
+            		><spring:message code="null"/>
             	</label>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">匹配方式</label>
+            <label class="control-label col-md-3"><spring:message code="match_method"/></label>
             <div class="col-md-8">
-            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="子串匹配"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="右匹配"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="左匹配"></spring:message></option>
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="完全匹配"></spring:message></option>
+            	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
+					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
 				</select>
             </div>
         </div>
@@ -100,19 +100,19 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否hex二进制</label>
+            <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
             <div class="col-md-8">
-            	<select name="isHexbin" class="selectpicker select2 form-control" title="--请选择--" >
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="大小写不敏感，且非HEX"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="HEX格式二进制"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="大小写敏感，且非HEX"></spring:message></option>
+            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
 				</select>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">区域生效id</label>
+            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
             <div class="col-md-8">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 1e5aee1c1..56e83b668 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -1,10 +1,10 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section">管控配置</h3>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">配置描述</label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
@@ -13,9 +13,9 @@
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">ip类型</label>
+            <label class="control-label col-md-3"><spring:message code="ip_type"/></label>
             <div class="col-md-6">
-            	 <select name="ipType" class="selectpicker show-tick form-control" title="--请选择--">
+            	 <select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
                    <option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
                  </select>
@@ -28,7 +28,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">源IP地址</label>
+            <label class="control-label col-md-3"><spring:message code="client_ip"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
             </div>
@@ -37,7 +37,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">源地址掩码</label>
+            <label class="control-label col-md-3"><spring:message code="client_address_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
             </div>
@@ -48,7 +48,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">源端口</label>
+            <label class="control-label col-md-3"><spring:message code="client_port"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
             </div>
@@ -57,7 +57,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">源端口掩码</label>
+            <label class="control-label col-md-3"><spring:message code="client_port_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
             </div>
@@ -68,7 +68,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">目的IP地址</label>
+            <label class="control-label col-md-3"><spring:message code="server_ip"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
             </div>
@@ -77,7 +77,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">目的地址掩码</label>
+            <label class="control-label col-md-3"><spring:message code="server_address_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
             </div>
@@ -88,7 +88,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">目的端口</label>
+            <label class="control-label col-md-3"><spring:message code="server_port"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
             </div>
@@ -97,7 +97,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">目的端口掩码</label>
+            <label class="control-label col-md-3"><spring:message code="server_port_mask"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
             </div>
@@ -108,9 +108,9 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">方向</label>
+            <label class="control-label col-md-3"><spring:message code="direction"/></label>
             <div class="col-md-6">
-            	<select name="direction" class="selectpicker show-tick form-control" title="--请选择--">
+            	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
                    <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>>1</option>
                  </select>
@@ -121,12 +121,12 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">协议</label>
+            <label class="control-label col-md-3"><spring:message code="protocol"/></label>
             <div class="col-md-6">
-            	<select name="protocol" class="selectpicker show-tick form-control" title="--请选择--">
+            	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
                    <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
-                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>>任意</option>
+                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
                 </select>
                 <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
             </div>
@@ -163,17 +163,17 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否区域管控</label>
+            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
             <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		>是
+            		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		>否
+            		><spring:message code="no"/>
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
@@ -182,7 +182,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">区域生效id</label>
+            <label class="control-label col-md-3"><spring:message code="area_effect_id"/></label>
             <div class="col-md-6">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index b260b5dee..e805126bd 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -1,10 +1,10 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section">管控配置</h3>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">配置描述</label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-8">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
@@ -12,7 +12,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">配置关键词</label>
+            <label class="control-label col-md-3"><spring:message code="key_word"/></label>
             <div class="col-md-8">
             	 <input class="form-control" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
             </div>
@@ -22,15 +22,15 @@
 <div class="row">
 	<div class="col-md-6">
 	    <div class="form-group ">
-	            <label class="control-label col-md-3">管控类型</label>
+	            <label class="control-label col-md-3"><spring:message code="block_type"/></label>
 	            <div class="col-md-8">
             	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
-            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
-            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
-            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> >封堵白名单</option>
-            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> >监测白名单</option>
-            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
+            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> ><spring:message code="block"/></option>                       
+            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>                     
+            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> ><spring:message code="block_white_list"/></option>            
+            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> ><spring:message code="monitor_white_list"/></option>          
+            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> ><spring:message code="block_monitor_white_list"/></option>
+            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> ><spring:message code="grey_list"/></option>                   
             	 </select>
                  <%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
             	</div>
@@ -38,17 +38,17 @@
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否区域管控</label>
+            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		>是
+            		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		>否
+            		><spring:message code="no"/>
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
@@ -58,30 +58,30 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">表达式类型</label>
+            <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		>与表达式
+            		><spring:message code="and"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="0"
             			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		>无表达式
+            		><spring:message code="null"/>
             	</label>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">匹配方式</label>
+            <label class="control-label col-md-3"><spring:message code="match_method"/></label>
             <div class="col-md-8">
             	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="子串匹配"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="右匹配"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="左匹配"></spring:message></option>
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="完全匹配"></spring:message></option>
+					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
+					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
+					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
+					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
 				</select>
             </div>
         </div>
@@ -90,19 +90,19 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否hex二进制</label>
+            <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
             <div class="col-md-8">
-            	<select name="isHexbin" class="selectpicker select2 form-control" title="--请选择--" >
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="大小写不敏感，且非HEX"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="HEX格式二进制"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="大小写敏感，且非HEX"></spring:message></option>
+            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
+					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
 				</select>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">区域生效id</label>
+            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
             <div class="col-md-8">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 563688564..59dd4aa74 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -31,7 +31,7 @@ $(function(){
                   <div class="portlet-title">
                      <div class="caption">
                          <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
 						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
@@ -80,8 +80,8 @@ $(function(){
                                   <div class="col-md-6">
                                       <div class="row">
                                           <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green">保存</button>
-                                              <button id="cancel" type="button" class="btn default">Cancel</button>
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
                                           </div>
                                       </div>
                                   </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 2f81e58be..f425df058 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -39,7 +39,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
 	</div>
 
 	<h3 class="page-title">
@@ -51,7 +51,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -73,11 +73,11 @@
 									<form:option value="0"><spring:message code="created"></spring:message></form:option>
 									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-									<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
+									<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 								</form:select>
-								<spring:message code="函号"/> :
-								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
-									<form:option value=""></form:option>
+								<spring:message code="request_number"/> :
+								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
+									<form:option value=""><spring:message code="select"/></form:option>
 									<c:forEach items="${requestInfos}" var="requestInfo" >
 										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 									</c:forEach>
@@ -85,15 +85,15 @@
 								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button>
-								<spring:message code="排序"/> : 
-								<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
-									<form:option value=""></form:option>
-									<form:option value="createTime asc">按创建时间顺序</form:option>
-									<form:option value="createTime desc">按创建时间倒序</form:option>
-									<form:option value="editTime asc">按修改时间顺序</form:option>
-									<form:option value="editTime desc">按修改时间倒序</form:option>
-									<form:option value="auditTime asc">按审核时间顺序</form:option>
-									<form:option value="auditTime desc">按审核时间倒序</form:option>
+								<spring:message code="sort"/> : 
+								<form:select path="page.orderBy" class="selectpicker select2">
+									<form:option value=""><spring:message code="select"/></form:option>
+									<form:option value="createTime asc"><spring:message code="createTime_asc"/></form:option>
+									<form:option value="createTime desc"><spring:message code="createTime_desc"/></form:option>
+									<form:option value="editTime asc"><spring:message code="editTime_asc"/></form:option>
+									<form:option value="editTime desc"><spring:message code="editTime_desc"/></form:option>
+									<form:option value="auditTime asc"><spring:message code="auditTime_asc"/></form:option>
+									<form:option value="auditTime desc"><spring:message code="auditTime_desc"/></form:option>
 								</form:select>
 							</div>
 						</form:form>
@@ -102,26 +102,26 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>序列</th>
-									<th>配置描述</th>
-									<th>配置关键词</th>
-									<th>管控类型</th>
+									<th><spring:message code="seq"/></th>
+									<th><spring:message code="config_describe"/></th>
+									<th><spring:message code="key_word"/></th>
+									<th><spring:message code="block_type"/></th>
 									<!-- <th>业务id</th> -->
-									<th>来函</th>
+									<th><spring:message code="letter"/></th>
 									<!-- <th>编译id</th> -->
-									<th>是否区域管控</th>
-									<th>分类</th>
-									<th>性质</th>
-									<th>标签</th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="type"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
 									<!-- <th>区域生效id</th> -->
-									<th>有效标识</th>
-									<th>是否审核</th>
-									<th>创建人员</th>
-									<th>配置时间</th>
-									<th>修改人员</th>
-									<th>修改时间</th>
-									<th>审核人员</th>
-									<th>审核时间</th>
+									<th><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="creator"/></th>
+									<th><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th><spring:message code="audit_time"/></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -132,19 +132,19 @@
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.cfgKeywords }</td>
 									<td>
-										<c:if test="${1 eq cfg.action }">阻断</c:if>
-										<c:if test="${2 eq cfg.action }">监测</c:if>
-										<c:if test="${5 eq cfg.action }">封堵白名单</c:if>
-										<c:if test="${6 eq cfg.action }">监测白名单</c:if>
-										<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
-										<c:if test="${8 eq cfg.action }">灰名单</c:if>
+										<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>                   
+										<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>                 
+										<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>        
+										<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>      
+										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
+										<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>               
 									</td>
 									<%-- <td>${cfg.serviceId }</td> --%>
 									<td>${cfg.requestName }</td>
 									<%-- <td>${cfg.compileId }</td> --%>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}">否</c:if>
-										<c:if test="${cfg.isAreaEffective==1}">是</c:if>
+										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
@@ -172,16 +172,16 @@
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
-										<c:if test="${cfg.isValid==0}">否</c:if>
-										<c:if test="${cfg.isValid==1}">是</c:if>
-										<c:if test="${cfg.isValid==-1}">已删除</c:if>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
+											<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>${cfg.creatorName }</td>