From 8f767f7f6346a0385fdc35cb4988cd2b00f4c85d Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 5 Mar 2018 18:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=8F=90=E7=A4=BA=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 3 ++-
 src/main/resources/messages/message_ru.properties    | 3 ++-
 src/main/resources/messages/message_zh_CN.properties | 2 ++
 src/main/webapp/WEB-INF/views/login.jsp              | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b33a28d98..7131aa19a 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -138,5 +138,6 @@ required=This field is required\uff01
 select=Please select
 date_list=Date List
 confirm_message=Are you sure?
-
+fill_loginName=Please fill in the loginName
+fill_loginPassWord=Please fill in the passWord
 #==========message end=====================
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 659b85104..7169f6d87 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -138,5 +138,6 @@ required=This field is required！
 select=Please select
 date_list=Date List
 confirm_message=Are you sure?
-
+fill_loginName=Please fill in the loginName
+fill_loginPassWord=Please fill in the passWord
 #==========message 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 2a817dcb5..fd0eb3da3 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -136,5 +136,7 @@ required=\u4e0d\u80fd\u4e3a\u7a7a!
 select=--\u8bf7\u9009\u62e9--
 date_list=\u6570\u636e\u5217\u8868
 confirm_message=\u786e\u5b9a\u5417\uff1f
+fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7
+fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
 
 #==========message end=====================
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index a9628796f..ef0916973 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -47,10 +47,10 @@
                         <img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div>
                     <form id="loginForm" class="login-form pull-left" action="${pageContext.request.contextPath }/login" method="post">
 						<div class="form-group">
-                            <input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="请填写登录账号"/>
+                            <input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="<spring:message code='fill_loginName'/>"/>
                         </div>
                         <div class="form-group">
-                        	<input type="password"  class="form-control placeholder-no-fix "  id="password" name="password" placeholder="请填写登录密码"/>
+                        	<input type="password"  class="form-control placeholder-no-fix "  id="password" name="password" placeholder="<spring:message code='fill_loginPassWord'/>"/>
                         </div>
                         
                       <%--  <c:if test="${not empty isValidateCodeLogin or isValidateCodeLogin==true}">