From f43d9ea925220f34649fdd8fe5935d6d49a3d15b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 27 Sep 2019 16:58:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/support/EmpUserServiceSupport.java | 8 +++++--- modules/core/src/main/resources/config/jeesite-core.yml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) 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 d2cc8f29..43bad92e 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 @@ -5,12 +5,14 @@ package com.jeesite.modules.sys.service.support; import java.util.List; +import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import com.jeesite.common.config.Global; import com.jeesite.common.entity.Page; import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.StringUtils; @@ -185,9 +187,9 @@ public class EmpUserServiceSupport extends CrudService failureNum++; String msg = "
" + failureNum + "、账号 " + user.getLoginCode() + " 导入失败："; if (e instanceof ConstraintViolationException){ - List messageList = ValidatorUtils.extractPropertyAndMessageAsList((ConstraintViolationException)e, ": "); - for (String message : messageList) { - msg += message + "; "; + ConstraintViolationException cve = (ConstraintViolationException)e; + for (ConstraintViolation violation : cve.getConstraintViolations()) { + msg += Global.getText(violation.getMessage()) + " ("+violation.getPropertyPath()+")"; } }else{ msg += e.getMessage(); diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index e5565857..7638ceba 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -389,6 +389,7 @@ shiro: # 默认的授权过滤定义，如果在filterChainDefinitions中已经定义，则该定义会被覆盖。 defaultFilterChainDefinitions: | /validCode = anon + /account/* = anon /static/** = anon /userfiles/** = anon /druid/** = perms[sys:state:druid]