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

14
blog-common/src/main/java/cn/celess/common/util/MD5Util.java
View File

@@ -1,14 +0,0 @@
package cn.celess.common.util;
import org.springframework.util.DigestUtils;
/**
* @author : xiaohai
* @date : 2019/03/30 18:56
*/
public class MD5Util {
public static String getMD5(String str) {
String md5 = DigestUtils.md5DigestAsHex(str.getBytes());
return md5;
}
}

17
blog-common/src/main/java/cn/celess/common/util/RequestUtil.java
View File

@@ -1,17 +0,0 @@
package cn.celess.common.util;
import javax.servlet.http.HttpServletRequest;
/**
* @Author: 小海
* @Date: 2019/10/18 15:44
* @Description:
*/
public class RequestUtil {
public static String getCompleteUrlAndMethod(HttpServletRequest request) {
// like this : /articles?page=1&count=5:GET
return request.getRequestURI() +
(request.getQueryString() == null ? "" : "?" + request.getQueryString()) +
":" + request.getMethod();
}
}

17
blog-common/src/main/java/cn/celess/common/util/StringFromHtmlUtil.java
View File

@@ -1,17 +0,0 @@
package cn.celess.common.util;
/**
* @author : xiaohai
* @date : 2019/03/28 17:21
*/
public class StringFromHtmlUtil {
public static String getString(String html) {
//从html中提取纯文本
//剔出<html>的标签
String txtcontent = html.replaceAll("</?[^>]+>", "");
//去除字符串中的空格,回车,换行符,制表符
txtcontent = txtcontent.replaceAll("<a>\\s*|\t|\r|\n</a>", "");
return txtcontent;
}
}

42
blog-common/src/main/java/cn/celess/common/util/StringUtil.java Normal file
View File

@@ -0,0 +1,42 @@
package cn.celess.common.util;
import org.springframework.util.DigestUtils;
import javax.servlet.http.HttpServletRequest;
/**
* @author : xiaohai
* @date : 2019/03/28 17:21
*/
public class StringUtil {
/**
* 从html中提取纯文本
*
* @param html html string
* @return 纯文本
*/
public static String getString(String html) {
//剔出<html>的标签
String txtcontent = html.replaceAll("</?[^>]+>", "");
//去除字符串中的空格,回车,换行符,制表符
txtcontent = txtcontent.replaceAll("<a>\\s*|\t|\r|\n</a>", "");
return txtcontent;
}
/**
* 生成MD5
*
* @param str 源数据
* @return md5 内容
*/
public static String getMD5(String str) {
return DigestUtils.md5DigestAsHex(str.getBytes());
}
public static String getCompleteUrlAndMethod(HttpServletRequest request) {
// like this : GET:/articles?page=1&count=5
return request.getMethod() + ":" + request.getRequestURI() +
(request.getQueryString() == null ? "" : "?" + request.getQueryString());
}
}

3
blog-common/src/main/java/cn/celess/common/util/VeriCodeUtil.java
View File

@@ -79,9 +79,8 @@ public class VeriCodeUtil {
*/
public static Color getRandomColor() {
Random ran = new Random();
Color color = new Color(ran.nextInt(256),
return new Color(ran.nextInt(256),
ran.nextInt(256), ran.nextInt(256));
return color;
}

8
blog-common/src/test/java/cn/celess/common/mapper/UserMapperTest.java
View File

@@ -4,7 +4,7 @@ import cn.celess.common.CommonBaseTest;
import cn.celess.common.enmu.RoleEnum;
import cn.celess.common.enmu.UserAccountStatusEnum;
import cn.celess.common.entity.User;
import cn.celess.common.util.MD5Util;
import cn.celess.common.util.StringUtil;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +51,7 @@ public class UserMapperTest extends CommonBaseTest {
@Test
public void updatePwd() {
User user = generateUser();
assertEquals(1, userMapper.updatePwd(user.getEmail(), MD5Util.getMD5("12345687654")));
assertEquals(1, userMapper.updatePwd(user.getEmail(), StringUtil.getMD5("12345687654")));
}
@Test
@@ -163,7 +163,7 @@ public class UserMapperTest extends CommonBaseTest {
user.setRole(RoleEnum.ADMIN_ROLE.getRoleName());
user.setAvatarImgUrl("https://celess.cn/examcple.jpg");
user.setEmail(randomStr(8) + "@celess.cn");
user.setPwd(MD5Util.getMD5("010100000100000"));
user.setPwd(StringUtil.getMD5("010100000100000"));
assertEquals(1, userMapper.update(user));
User byId = userMapper.findById(user.getId());
assertEquals(user.getDesc(), byId.getDesc());
@@ -176,7 +176,7 @@ public class UserMapperTest extends CommonBaseTest {
}
private User generateUser() {
User user = new User(randomStr(6) + "@celess.cn", MD5Util.getMD5("1234567890"));
User user = new User(randomStr(6) + "@celess.cn", StringUtil.getMD5("1234567890"));
userMapper.addUser(user);
User newUser = userMapper.findByEmail(user.getEmail());
assertEquals(user.getId(), newUser.getId());

4
blog-common/src/test/java/cn/celess/common/util/MD5UtilTest.java → blog-common/src/test/java/cn/celess/common/util/StringUtilTest.java
View File

@@ -5,10 +5,10 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class MD5UtilTest extends CommonBaseTest {
public class StringUtilTest extends CommonBaseTest {
@Test
public void getMD5() {
assertEquals("25f9e794323b453885f5181f1b624d0b", MD5Util.getMD5("123456789"));
assertEquals("25f9e794323b453885f5181f1b624d0b", StringUtil.getMD5("123456789"));
}
}