zheng/blog-backEnd
1
0
Fork 0
Code Issues 5 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

重构工具类

Browse Source
This commit is contained in:
禾几海
2021-10-01 15:57:46 +08:00
parent fa120a6da5
commit 366ce4b829
13 changed files with 75 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
blog-user/src/main/java/cn/celess/user/serviceimpl/UserServiceImpl.java
View File

@@ -15,10 +15,10 @@ import cn.celess.common.mapper.UserMapper;
import cn.celess.common.service.MailService;
import cn.celess.common.service.QiniuService;
import cn.celess.common.service.UserService;
import cn.celess.common.util.MD5Util;
import cn.celess.common.util.ModalTrans;
import cn.celess.common.util.RedisUtil;
import cn.celess.common.util.RegexUtil;
import cn.celess.common.util.StringUtil;
import cn.celess.user.util.JwtUtil;
import cn.celess.user.util.RedisUserUtil;
import com.github.pagehelper.PageHelper;
@@ -79,7 +79,7 @@ public class UserServiceImpl implements UserService {
if (userMapper.existsByEmail(email)) {
throw new BlogResponseException(ResponseEnum.USERNAME_HAS_EXIST);
}
User user = new User(email, MD5Util.getMD5(password));
User user = new User(email, StringUtil.getMD5(password));
boolean b = userMapper.addUser(user) == 1;
if (b) {
String verifyId = UUID.randomUUID().toString().replaceAll("-", "");
@@ -125,7 +125,7 @@ public class UserServiceImpl implements UserService {
String token;
// 密码比对
if (user.getPwd().equals(MD5Util.getMD5(loginReq.getPassword()))) {
if (user.getPwd().equals(StringUtil.getMD5(loginReq.getPassword()))) {
logger.info("====> {} 进行权限认证 状态：登录成功 <====", loginReq.getEmail());
userMapper.updateLoginTime(loginReq.getEmail());
redisUtil.delete(loginReq.getEmail() + "-passwordWrongTime");
@@ -307,10 +307,10 @@ public class UserServiceImpl implements UserService {
throw new BlogResponseException(ResponseEnum.FAILURE.getCode(), "请先获取重置密码的邮件");
}
if (resetPwdIdFromCache.equals(verifyId)) {
if (MD5Util.getMD5(pwd).equals(user.getPwd())) {
if (StringUtil.getMD5(pwd).equals(user.getPwd())) {
throw new BlogResponseException(ResponseEnum.PWD_SAME);
}
userMapper.updatePwd(email, MD5Util.getMD5(pwd));
userMapper.updatePwd(email, StringUtil.getMD5(pwd));
redisUtil.delete(user.getEmail() + "-resetPwd");
return "验证成功";
} else {
@@ -380,7 +380,7 @@ public class UserServiceImpl implements UserService {
if (!RegexUtil.pwdMatch(userReq.getPwd())) {
throw new BlogResponseException(ResponseEnum.PARAMETERS_PWD_ERROR);
}
user.setPwd(MD5Util.getMD5(userReq.getPwd()));
user.setPwd(StringUtil.getMD5(userReq.getPwd()));
}
if (userReq.getRole() != null) {
if (RoleEnum.USER_ROLE.getRoleName().equals(userReq.getRole()) || RoleEnum.ADMIN_ROLE.getRoleName().equals(userReq.getRole())) {
@@ -416,13 +416,13 @@ public class UserServiceImpl implements UserService {
public UserModel setPwd(String pwd, String newPwd, String confirmPwd) {
User user = redisUserUtil.get();
String pwd1 = userMapper.getPwd(user.getEmail());
if (!MD5Util.getMD5(pwd).equals(pwd1)) {
if (!StringUtil.getMD5(pwd).equals(pwd1)) {
throw new BlogResponseException(ResponseEnum.PWD_WRONG);
}
if (!newPwd.equals(confirmPwd)) {
throw new BlogResponseException(ResponseEnum.PWD_NOT_SAME);
}
userMapper.updatePwd(user.getEmail(), MD5Util.getMD5(newPwd));
userMapper.updatePwd(user.getEmail(), StringUtil.getMD5(newPwd));
return ModalTrans.userFullInfo(userMapper.findByEmail(user.getEmail()));
}
}

14
blog-user/src/test/java/cn/celess/user/controller/UserControllerTest.java
View File

@@ -8,8 +8,8 @@ import cn.celess.common.entity.vo.PageData;
import cn.celess.common.entity.vo.UserModel;
import cn.celess.common.mapper.UserMapper;
import cn.celess.common.service.UserService;
import cn.celess.common.util.MD5Util;
import cn.celess.common.util.RedisUtil;
import cn.celess.common.util.StringUtil;
import cn.celess.user.UserBaseTest;
import com.fasterxml.jackson.core.type.TypeReference;
import org.junit.Test;
@@ -138,7 +138,7 @@ public class UserControllerTest extends UserBaseTest {
@Test
public void emailVerify() throws Exception {
String email = randomStr(4) + "@celess.cn";
String pwd = MD5Util.getMD5("123456789");
String pwd = StringUtil.getMD5("123456789");
userMapper.addUser(new User(email, pwd));
String verifyId = randomStr();
LoginReq req = new LoginReq(email, "123456789", true);
@@ -151,7 +151,7 @@ public class UserControllerTest extends UserBaseTest {
@Test
public void resetPwd() throws Exception {
String email = randomStr(4) + "@celess.cn";
String pwd = MD5Util.getMD5("1234567890");
String pwd = StringUtil.getMD5("1234567890");
userMapper.addUser(new User(email, pwd));
LoginReq req = new LoginReq(email, "1234567890", true);
String verifyId = randomStr();
@@ -172,7 +172,7 @@ public class UserControllerTest extends UserBaseTest {
for (int i = 0; i < 10; i++) {
String s = randomStr();
String email = s.substring(s.length() - 4) + "@celess.cn";
String pwd = MD5Util.getMD5("123456789");
String pwd = StringUtil.getMD5("123456789");
User user = new User(email, pwd);
int i1 = userMapper.addUser(user);
if (i1 == 0) {
@@ -206,7 +206,7 @@ public class UserControllerTest extends UserBaseTest {
public void updateInfoByAdmin() throws Exception {
UserReq userReq = new UserReq();
String email = randomStr(4) + "@celess.cn";
User user = new User(email, MD5Util.getMD5("123456789"));
User user = new User(email, StringUtil.getMD5("123456789"));
userMapper.addUser(user);
User userByDb = userMapper.findByEmail(email);
userReq.setId(userByDb.getId());
@@ -261,7 +261,7 @@ public class UserControllerTest extends UserBaseTest {
@Test
public void setPwd() throws Exception {
String email = randomStr(4) + "@celess.cn";
assertEquals(1, userMapper.addUser(new User(email, MD5Util.getMD5("1234567890"))));
assertEquals(1, userMapper.addUser(new User(email, StringUtil.getMD5("1234567890"))));
LoginReq req = new LoginReq(email, "1234567890", false);
String token = login(req);
assertNotNull(token);
@@ -271,7 +271,7 @@ public class UserControllerTest extends UserBaseTest {
param.add("confirmPwd", "aaabbbccc");
getMockData(post("/user/setPwd").params(param), token).andDo(result -> {
assertEquals(SUCCESS.getCode(), getResponse(result).getCode());
assertEquals(MD5Util.getMD5("aaabbbccc"), userMapper.getPwd(email));
assertEquals(StringUtil.getMD5("aaabbbccc"), userMapper.getPwd(email));
});
}
}

4
blog-user/src/test/java/cn/celess/user/serviceimpl/UserServiceTest.java
View File

@@ -9,7 +9,7 @@ import cn.celess.common.entity.vo.UserModel;
import cn.celess.common.exception.BlogResponseException;
import cn.celess.common.mapper.UserMapper;
import cn.celess.common.service.UserService;
import cn.celess.common.util.MD5Util;
import cn.celess.common.util.StringUtil;
import cn.celess.user.UserBaseTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@ public class UserServiceTest extends UserBaseTest {
public void testLogin() {
// 测试账户 被锁 被删除 登录
String email = randomStr(5) + "@celess.cn";
String pwd = MD5Util.getMD5("123456789");
String pwd = StringUtil.getMD5("123456789");
User user = new User(email, pwd);
userMapper.addUser(user);
assertNotNull(user.getId());