From 04781bed25879bc60ccc2c66362a96e8e662bc38 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 5 May 2019 15:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E4=BD=8F=E5=AF=86=E7=A0=81=20?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=94=B9=E4=B8=BA=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/common/shiro/filter/FormAuthenticationFilter.java   | 2 +-
 .../core/src/main/resources/i18n/core/sys/i18n_en.properties    | 2 +-
 .../resources/views/themes/default/modules/sys/sysLogin.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java
index 1c2f32f9..f1648f24 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java
@@ -70,7 +70,7 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 	protected AuthenticationToken createToken(ServletRequest request, ServletResponse response) {
 		String username = getUsername(request, response);	// 用户名
 		String password = getPassword(request);				// 登录密码
-		boolean rememberMe = isRememberMe(request);			// 记住我（记住密码）
+		boolean rememberMe = isRememberMe(request);			// 记住我（自动登录）
 		String host = getHost(request);						// 登录主机
 		String captcha = getCaptcha(request);				// 登录验证码
 		Map<String, Object> paramMap = ServletUtils.getExtParams(request);	// 登录附加参数
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 00a6bde3..43fc75fb 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
@@ -52,7 +52,7 @@
 公共场所慎用,下次不需要再填写帐号=Use caution in public places.
 记住账号=Remember account
 公共场所慎用,下次不需要再填写帐号和密码=Use caution in public places.
-记住密码=Remember password
+自动登录=Remember password
 
 登录验证成功，正在进入...=Login authentication successful, entering...
 正在验证登录，请稍候...=Verify login, please wait...
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 0b570e34..96efa68e 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
@@ -43,7 +43,7 @@
 						class="form-control" data-style="square-blue"> ${text('记住账号')}</label> &nbsp; 
 					<label title="${text('公共场所慎用,下次不需要再填写帐号和密码')}"><input type="checkbox"
 						name="rememberMe"${isNotBlank(cookie('rememberMe'))?' checked':''}
-						class="form-control" data-style="square-blue"> ${text('记住密码')}</label>
+						class="form-control" data-style="square-blue"> ${text('自动登录')}</label>
 				</div>
 			</div>
 			<div class="form-group">