From b3288924476061e5745c57895f7f3c90ef8f3838 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 5 May 2023 13:54:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=2068483=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=88=91=E7=9A=84=E9=83=A8=E9=97=A8=20=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7-=E6=8F=90=E4=BA=A4=20=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/DuplicateCheckController.java | 6 ++++++ .../modules/system/service/impl/SysUserServiceImpl.java | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java index 04dc63b0..74e71fe8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java @@ -3,6 +3,7 @@ package com.jero.modules.system.controller; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Results; +import com.jero.common.util.PasswordUtil; import org.apache.commons.lang.StringUtils; import com.jero.common.util.SqlInjectionUtil; import com.jero.modules.system.mapper.SysDictMapper; @@ -47,6 +48,11 @@ public class DuplicateCheckController { //SQL注入校验（只限制非法串改数据库） final String[] sqlInjCheck = {duplicateCheckVo.getTableName(),duplicateCheckVo.getFieldName()}; SqlInjectionUtil.filterContent(sqlInjCheck); + if ("phone".equals(duplicateCheckVo.getFieldName())) { + if (StringUtils.isNotBlank(duplicateCheckVo.getFieldVal())) { + duplicateCheckVo.setFieldVal(PasswordUtil.encrypt(duplicateCheckVo.getFieldVal())); + } + } if (StringUtils.isNotBlank(duplicateCheckVo.getDataId())) { // [2].编辑页面校验 num = sysDictMapper.duplicateCheckCountSql(duplicateCheckVo); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 4de7d1e6..8dd79773 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Results; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.SysUserCacheInfo; @@ -24,6 +25,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysUserDepNameVo; import com.jero.modules.system.vo.SysUserRoleNameVo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -519,7 +521,7 @@ public class SysUserServiceImpl extends ServiceImpl impl String email = user.getEmail(); String phone = user.getPhone(); if (StrUtil.isNotEmpty(email)){ - // 对邮箱地址进行加密 + // 对邮箱地址进行解密 try { email = PasswordUtil.decrypt(email); } catch (Exception e) { @@ -529,7 +531,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } if (StrUtil.isNotEmpty(phone)){ - // 对手机号码进行加密 + // 对手机号码进行解密 try { phone = PasswordUtil.decrypt(phone); } catch (Exception e) {