From f8ff9ae5a3233d68473b384088f4f8f69e79910f Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 23 May 2023 21:00:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?//=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxUserGrantController.java | 4 ++-- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- .../src/main/java/com/iformall/utils/PasswordHelper.java | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index cfa2904..63b03fc 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -147,7 +147,7 @@ public class WxUserGrantController extends BaseController { return new ResultData(ErrorCode.USER_IS_EMPTY); } - String encryptPassword = new PasswordHelper().encryptPassword(phone, password); + String encryptPassword = new PasswordHelper().encryptPassword(password); if(!encryptPassword.equals(basicInfo.getPassword())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "手机号或密码错误"); @@ -328,7 +328,7 @@ public class WxUserGrantController extends BaseController { return new ResultData(Result.ERROR, e.getMessage()); } if(isValidCode) { - String encryptPassword = new PasswordHelper().encryptPassword(phone, pwd); + String encryptPassword = new PasswordHelper().encryptPassword(pwd); WxCUserBasicInfo basicInfoUpd = new WxCUserBasicInfo(); basicInfoUpd.setId(basicInfo.getId()); basicInfoUpd.setPassword(encryptPassword); diff --git a/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index f364527..1bb18e0 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -844,7 +844,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc basicInfo.setFinalTenantId(tenantEntity.getFinalTenantId()); basicInfo.setPhone(phone); if(StringUtils.isNotBlank(pwd)){ - String encryptPassword = new PasswordHelper().encryptPassword(phone, pwd); + String encryptPassword = new PasswordHelper().encryptPassword(pwd); basicInfo.setPassword(encryptPassword); } this.save(basicInfo); diff --git a/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java b/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java index 48cb430..bd92ec3 100644 --- a/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java +++ b/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java @@ -23,6 +23,9 @@ public class PasswordHelper { return new SimpleHash(algorithmName, password, ByteSource.Util.bytes(userName), hashIterations).toHex(); } + public String encryptPassword(String password) { + return new SimpleHash(algorithmName, password, hashIterations).toHex(); + } public static void main(String[] args) { From 1729f6f572be907cbce45068f4791019b1485a9e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 23 May 2023 21:14:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?//=E5=8A=A0=E7=9B=90=E5=92=8C=E8=83=A1?= =?UTF-8?q?=E6=A4=92=E7=B2=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/utils/PasswordHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java b/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java index bd92ec3..36974b7 100644 --- a/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java +++ b/suimangService/src/main/java/com/iformall/utils/PasswordHelper.java @@ -10,6 +10,7 @@ public class PasswordHelper { //private RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator(); private String algorithmName = "md5"; private int hashIterations = 2; + private String salt = "salt and pepper"; public void encryptPassword(MallUserInfo user) { //String salt=randomNumberGenerator.nextBytes().toHex(); @@ -24,7 +25,7 @@ public class PasswordHelper { } public String encryptPassword(String password) { - return new SimpleHash(algorithmName, password, hashIterations).toHex(); + return new SimpleHash(algorithmName, password, ByteSource.Util.bytes(salt), hashIterations).toHex(); }