Преглед на файлове

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 RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();
private String algorithmName = "md5"; private String algorithmName = "md5";
private int hashIterations = 2; private int hashIterations = 2;
private String salt = "salt and pepper";


public void encryptPassword(MallUserInfo user) { public void encryptPassword(MallUserInfo user) {
//String salt=randomNumberGenerator.nextBytes().toHex(); //String salt=randomNumberGenerator.nextBytes().toHex();
@@ -24,11 +25,10 @@ public class PasswordHelper {
} }


public String encryptPassword(String password) { 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) { public static void main(String[] args) {
MallUserInfo user = new MallUserInfo(); MallUserInfo user = new MallUserInfo();
user.setUsername("mfadmin"); user.setUsername("mfadmin");


Зареждане…
Отказ
Запис