|
@@ -1,7 +1,8 @@
|
|
|
package cn.com.ty.lift.system.utils;
|
|
|
|
|
|
-import cn.hutool.core.codec.Base64;
|
|
|
+import cn.com.ty.lift.common.utils.Base64Encoder;
|
|
|
|
|
|
+import java.nio.charset.StandardCharsets;
|
|
|
import java.security.MessageDigest;
|
|
|
import java.util.Random;
|
|
|
|
|
@@ -19,14 +20,14 @@ public class PasswordUtils {
|
|
|
* @date 2019/11/27 10:03 AM
|
|
|
*/
|
|
|
public static String randomCode() {
|
|
|
- String checkCode = "";
|
|
|
+ StringBuilder checkCode = new StringBuilder();
|
|
|
char[] character = {'0', '1', '2', '3', '4', '5', '6', '8', '9'};
|
|
|
Random random = new Random();
|
|
|
//生成验证码字符串
|
|
|
for (int i = 0; i < 16; i++) {
|
|
|
- checkCode += character[random.nextInt(character.length)];
|
|
|
+ checkCode.append(character[random.nextInt(character.length)]);
|
|
|
}
|
|
|
- return checkCode;
|
|
|
+ return checkCode.toString();
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -36,18 +37,18 @@ public class PasswordUtils {
|
|
|
* @description 对密码进行加盐并进行hash加密
|
|
|
*/
|
|
|
public static String generatePassword(String password, String salt) {
|
|
|
- try{
|
|
|
+ try {
|
|
|
String newPassword = password + salt;
|
|
|
//sha1加密
|
|
|
- MessageDigest md = MessageDigest.getInstance("SHA1");
|
|
|
+ MessageDigest md = MessageDigest.getInstance("SHA-1");
|
|
|
//把字符串转为字节数组
|
|
|
- byte[] bytePassword = newPassword.getBytes();
|
|
|
+ byte[] bytePassword = newPassword.getBytes(StandardCharsets.UTF_16LE);
|
|
|
//使用指定的字节来更新我们的摘要
|
|
|
md.update(bytePassword);
|
|
|
//获取密文 (完成摘要计算)
|
|
|
bytePassword = md.digest();
|
|
|
- return Base64.encode(bytePassword);
|
|
|
- } catch (Exception e){
|
|
|
+ return new Base64Encoder().encode(bytePassword);
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
return "";
|