From e60e9a57ea6fe0e8d2f349232766b2662a74a278 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 09:38:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  3 +
 .../messages/message_zh_CN.properties         |  3 +
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 78 +++++++++++--------
 3 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index d680ccac3..f0c3ceafb 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -228,4 +228,7 @@ block_url=block url
 configuration=configuration
 direction=direction
 protocol=protocol
+oneway=oneway
+twoway=twoway
+arbitrary=arbitrary
 #==========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 8c7f9df9e..7cace7e7d 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -226,4 +226,7 @@ block_url=\u5c01\u5835\u8def\u5f84
 configuration=\u914d\u7f6e
 direction=\u65b9\u5411
 protocol=\u534f\u8bae
+oneway=\u5355\u5411
+twoway=\u53cc\u5411
+arbitrary=\u4efb\u610f
 #==========guankongbaimingdan end=====================
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index d17d3fa83..e993bc3d3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script>
  	$(document).ready(function() {
 		
@@ -25,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">
@@ -37,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=""
@@ -59,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>
@@ -71,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>
@@ -88,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>

From 44a80c5771029f466e92cb7845f9ca58c14cccb3 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 09:44:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index e993bc3d3..2f81e58be 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="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></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="date_list"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="详情"></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="cancel_approved"></spring:message></form:option>
+									<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
 								</form:select>
-								<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>
+								<spring:message code="函号"/> :
+								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
+									<form:option value=""></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="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>
+								<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>
 								</form:select>
 							</div>
 						</form:form>
@@ -102,26 +102,26 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<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>序列</th>
+									<th>配置描述</th>
+									<th>配置关键词</th>
+									<th>管控类型</th>
 									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
+									<th>来函</th>
 									<!-- <th>编译id</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>是否区域管控</th>
+									<th>分类</th>
+									<th>性质</th>
+									<th>标签</th>
 									<!-- <th>区域生效id</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>有效标识</th>
+									<th>是否审核</th>
+									<th>创建人员</th>
+									<th>配置时间</th>
+									<th>修改人员</th>
+									<th>修改时间</th>
+									<th>审核人员</th>
+									<th>审核时间</th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>

From 8602e1975dcc7ab3a84bfe62a2f7712e89eb5b98 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 09:47:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8A=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

---
 src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp | 2 +-
 src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 1d3c3d663..15ba81533 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -98,8 +98,8 @@
 									<!-- <th>编译id</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><spring:message code="property"/></th>
 									<!-- <th>区域生效id</th> -->
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 66e967c00..4f8f8fa73 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -108,8 +108,8 @@
 									<!-- <th>编译id</th> -->
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="type"/></th>
-									<th><spring:message code="label"/></th>
 									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
 									<!-- <th>区域生效id</th> -->
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>