From 195c0af52f9637e35ff5e78cb1274a525762beae Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 11 Oct 2019 20:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/common/shiro/realm/AuthorizingRealm.java | 10 ++++++++++ .../sys/service/support/EmpUserServiceSupport.java | 2 +- .../resources/i18n/core/common_view/i18n_en.properties | 1 + .../i18n/core/common_view/i18n_ja_JP.properties | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java index 5c2310e1..0b5b2930 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java @@ -5,6 +5,8 @@ package com.jeesite.common.shiro.realm; import javax.servlet.http.HttpServletRequest; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; import com.jeesite.common.codec.EncodeUtils; @@ -54,6 +56,14 @@ public class AuthorizingRealm extends BaseAuthorizingRealm { return super.getUserInfo(token); } + /** + * 校验登录凭证 + */ + @Override + protected void assertCredentialsMatch(AuthenticationToken authcToken, AuthenticationInfo authcInfo) throws AuthenticationException { + super.assertCredentialsMatch(authcToken, authcInfo); + } + /** * 生成密文密码，生成随机的16位salt并经过1024次 sha-1 hash * @param plainPassword 明文密码 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index 43bad92e..f132828f 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -157,7 +157,7 @@ public class EmpUserServiceSupport extends CrudService @Transactional(readOnly=false) public String importData(MultipartFile file, Boolean isUpdateSupport) { if (file == null){ - throw new ServiceException("请选择导入的数据文件！"); + throw new ServiceException(text("请选择导入的数据文件！")); } int successNum = 0; int failureNum = 0; StringBuilder successMsg = new StringBuilder(); diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties index 7b968981..1e5be275 100644 --- a/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties @@ -4,6 +4,7 @@ 保\ 存=Save 关\ 闭=Close 确定=Ok +确\ 定=Ok 清除=Clear 关闭=Close 查询=Search diff --git a/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties index fb62bcf0..2d970f44 100644 --- a/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties +++ b/modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties @@ -4,6 +4,7 @@ 保\ 存=保存 关\ 闭=閉じる 确定=はい +确\ 定=はい 清除=クリア 关闭=閉じる 查询=検索