From e1dd80d64323b8b8b8c296b12b43d942c093931e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Dec 2019 23:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=AC=A2=E8=BF=8E=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/i18n/core/sys/i18n_en.properties | 1 +
 .../core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties  | 1 +
 .../resources/views/themes/default/modules/sys/sysLogin.html     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
index 4ae8c460..9d19d6cf 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
@@ -68,6 +68,7 @@
 # =========== 登录页 ===========
 
 登录=Login
+欢迎回来=Welcome
 
 请填写登录账号.=Please enter login account.
 登录账号=Login account
diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
index 0554c25a..1dd42e67 100644
--- a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
+++ b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties
@@ -69,6 +69,7 @@
 # =========== 登录页 ===========
 
 登录=ログイン
+欢迎回来=おかえり
 
 请填写登录账号.=ログインＩＤを入力してください.
 登录账号=ログインアカウント
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
index bcef0257..2553ad4e 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
@@ -10,6 +10,7 @@
 	</div>
 	<div class="login-box-body">
 		<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
+			<h4 class="login-box-msg">${text('欢迎回来')}！</h4>
 			<div class="form-group has-feedback">
 				<span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span>
 				<#form:input type="text" name="username" class="form-control required"