From e5c5137e91c04fff001d439d64ed5a253e3fc8da Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 23 十月 2023 20:18:05 +0800
Subject: [PATCH] 初期提交四川相关配置
---
src/main/java/com/fzzy/sys/UserPR.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/sys/UserPR.java b/src/main/java/com/fzzy/sys/UserPR.java
index a2d884d..ab3a1f0 100644
--- a/src/main/java/com/fzzy/sys/UserPR.java
+++ b/src/main/java/com/fzzy/sys/UserPR.java
@@ -5,19 +5,13 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.entity.EntityState;
import com.bstek.dorado.data.entity.EntityUtils;
-import com.fzzy.api.Constant;
import com.fzzy.sys.entity.SysUser;
import com.fzzy.sys.repository.UserRepository;
import org.apache.commons.lang.math.RandomUtils;
-import org.bouncycastle.crypto.generators.BCrypt;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -31,7 +25,6 @@
@Autowired
private UserRepository userRepository;
- private BCryptPasswordEncoder bCryptPasswordEncoder;
/**
* sys.userPR#findAll
@@ -65,10 +58,10 @@
//瀵嗙爜鍔犲瘑
int salt = RandomUtils.nextInt(27);
salt += 4;
- bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);
- String password = bCryptPasswordEncoder.encode(entity.getPassword());
+// bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);
+// String password = bCryptPasswordEncoder.encode(entity.getPassword());
// boolean b= bCryptPasswordEncoder.matches(entity.getPassword(),password);
- entity.setPassword(password);
+ entity.setPassword(entity.getPassword());
entity.setSalt(String.valueOf(salt));
}
// 鎵嬪姩灏哾oradoEntity瀵硅薄杞崲涓烘爣鍑咮ean瀵硅薄
@@ -101,9 +94,9 @@
//瀵嗙爜鍔犲瘑
int salt = RandomUtils.nextInt(27);
salt += 4;
- bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);
- String password = bCryptPasswordEncoder.encode(Constant.DEFAULT_USER_PASSWORD);
- entity.setPassword(password);
+// bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);
+// String password = bCryptPasswordEncoder.encode(Constant.DEFAULT_USER_PASSWORD);
+ entity.setPassword(entity.getPassword());
entity.setSalt(String.valueOf(salt));
SysUser data = new SysUser();
--
Gitblit v1.9.3