|
|
@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
+import javax.validation.ConstraintViolationException;
|
|
|
import javax.validation.Validator;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -16,9 +17,11 @@ import com.ruoyi.common.core.domain.entity.SysRole;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.text.Convert;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
+import com.ruoyi.common.utils.ExceptionUtil;
|
|
|
import com.ruoyi.common.utils.ShiroUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.bean.BeanValidators;
|
|
|
+import com.ruoyi.common.utils.html.EscapeUtil;
|
|
|
import com.ruoyi.common.utils.security.Md5Utils;
|
|
|
import com.ruoyi.common.utils.spring.SpringUtils;
|
|
|
import com.ruoyi.system.domain.SysPost;
|
|
|
@@ -529,7 +532,12 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
catch (Exception e)
|
|
|
{
|
|
|
failureNum++;
|
|
|
- String msg = "<br/>" + failureNum + "、账号 " + user.getLoginName() + " 导入失败:";
|
|
|
+ String loginName = user.getLoginName();
|
|
|
+ if (ExceptionUtil.isCausedBy(e, ConstraintViolationException.class))
|
|
|
+ {
|
|
|
+ loginName = EscapeUtil.clean(loginName);
|
|
|
+ }
|
|
|
+ String msg = "<br/>" + failureNum + "、账号 " + loginName + " 导入失败:";
|
|
|
failureMsg.append(msg + e.getMessage());
|
|
|
log.error(msg, e);
|
|
|
}
|