소스 검색

Merge branch 'master' of https://git.malls.iformall.com/suimang/suimangServer into photo

 Conflicts:
	suimangService/src/main/java/com/iformall/utils/PasswordHelper.java
private_deployment
xhxu 2 년 전
부모
커밋
e066e8c4b2
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. +2
    -2
      suimangService/src/main/java/com/iformall/utils/PasswordHelper.java

+ 2
- 2
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,11 +25,10 @@ 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();
}



public static void main(String[] args) {
MallUserInfo user = new MallUserInfo();
user.setUsername("mfadmin");


불러오는 중...
취소
저장