From b41c38336709de23038400cd4b702ce17823b237 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 26 Apr 2024 14:46:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=20=E9=9B=86=E5=9B=A2=E5=8F=82=E4=B8=8E=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E7=9A=84=E9=82=AE=E7=AE=B1=E5=92=8C=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E5=AF=86=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/util/PasswordUtil.java | 17 +++++++++++++++++
 .../system/service/impl/SysUserServiceImpl.java | 14 +-------------
 .../LawsStandardizationController.java          |  1 -
 .../impl/LawsStandardizationServiceImpl.java    |  5 +++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/util/PasswordUtil.java b/laws-base/laws-base-core/src/main/java/com/jero/common/util/PasswordUtil.java
index b30e8727..9eb9fd9a 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/common/util/PasswordUtil.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/common/util/PasswordUtil.java
@@ -1,5 +1,6 @@
 package com.jero.common.util;
 
+import cn.hutool.core.util.StrUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -233,4 +234,20 @@ public class PasswordUtil {
 		return (byte) "0123456789ABCDEF".indexOf(c);
 	}
 
+	/**
+	 * 回显时加密邮箱
+	 * @param email
+	 * @return
+	 */
+	public static String desensitizedEmail(String email) {
+		if (StrUtil.isBlank(email)) {
+			return StrUtil.EMPTY;
+		}
+		int index = StrUtil.indexOf(email, '@');
+		if (index <= 4) {
+			return StrUtil.hide(email, 0, index);
+		}
+		return StrUtil.hide(email, index - 4, index);
+	}
+
 }
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index 2357c2f2..3bd8ac9f 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
-import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
@@ -559,7 +558,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			} catch (Exception e) {
 				email = user.getEmail();
 			}
-			user.setEmail(DesensitizedEmail(email));
+			user.setEmail(PasswordUtil.desensitizedEmail(email));
 		}
 
 		if (StrUtil.isNotEmpty(phone)){
@@ -573,17 +572,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 	}
 
-	private String DesensitizedEmail(String email) {
-		if (StrUtil.isBlank(email)) {
-			return StrUtil.EMPTY;
-		}
-		int index = StrUtil.indexOf(email, '@');
-		if (index <= 4) {
-			return StrUtil.hide(email, 0, index);
-		}
-		return StrUtil.hide(email, index - 4, index);
-	}
-
 	@Override
 	public String proceedEmailDecrypt(String email) {
 		if (StrUtil.isNotEmpty(email)){
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
index 9d060917..6c0c184b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
@@ -107,7 +107,6 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
 	 @PostMapping(value = "/edit")
 	 @RequiresPermissions("standardActivity:edit")
 	 public Result<T> edit(@Validated @RequestBody StandardizationVO standardizationVO) {
-		 log.info("");
 		 lawsStandardizationService.addOrUpdateStandardization(standardizationVO, LawsStandardizationCommon.SOURCE_1);
 		 return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
 	 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
index b458cf54..4925d3a1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.laws.standardization.service.impl;
 
+import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -516,9 +517,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 				lawsStandardizationGroup.setDepartment(departNames);
 			}
 			// 电话
-			lawsStandardizationGroup.setPhone(PasswordUtil.decrypt(sysUser.getPhone()));
+			lawsStandardizationGroup.setPhone(DesensitizedUtil.mobilePhone(PasswordUtil.decrypt(sysUser.getPhone())));
 			// 邮箱
-			lawsStandardizationGroup.setMailbox(PasswordUtil.decrypt(sysUser.getEmail()));
+			lawsStandardizationGroup.setMailbox(PasswordUtil.desensitizedEmail(PasswordUtil.decrypt(sysUser.getEmail())));
 		}
 	}