From e267e1fec2f795a13890b1232c6a653380a406ff Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Mon, 28 Aug 2023 17:37:38 +0800 Subject: [PATCH] update --- .../com/ydool/common/utils/LoginNameUtil.java | 61 ++++ .../com/ydool/common/utils/PasswordUtil.java | 280 +++++++++++++++++- .../system/service/impl/AuthServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 11 +- src/main/resources/ehcache.xml | 110 +++++++ src/main/resources/logback-spring.xml | 54 ++++ 6 files changed, 509 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/ydool/common/utils/LoginNameUtil.java create mode 100644 src/main/resources/ehcache.xml create mode 100644 src/main/resources/logback-spring.xml diff --git a/src/main/java/com/ydool/common/utils/LoginNameUtil.java b/src/main/java/com/ydool/common/utils/LoginNameUtil.java new file mode 100644 index 0000000..8dd1f40 --- /dev/null +++ b/src/main/java/com/ydool/common/utils/LoginNameUtil.java @@ -0,0 +1,61 @@ +package com.ydool.common.utils; + +import com.ydool.common.exception.ResultException; + +public class LoginNameUtil { + + /** + * 检查用户名规则 + * + * @param userName + * @return + */ + public static String checkp(String userName) { + //用户名必须为6-20位。 + if (userName.length() < 6 || userName.length() > 20) { + return "用户名必须为6-20位"; + } + // 用户名只能包含数字、字母和下划线。 + String str = "^[a-zA-Z0-9_]+$"; + if (!userName.matches(str)) { + return "用户名只能包含数字、字母和下划线"; + } + // 用户名不能以数字开头。 + String str1 = "^[a-zA-Z_][a-zA-Z0-9_]*$"; + if (!userName.matches(str1)) { + return "用户名不能以数字开头"; + } + return "ok"; + } + + /** + * 检查用户名是否包含关键字 + * + * @param userName + * @return + */ + public static String checkKeyword(String userName) { + //忽略大小写关键字为admin,system,ydool,833457,6500189 + String[] keywords = {"admin", "system", "ydool", "833457", "6500189"}; + for (String keyword : keywords) { + if (userName.toLowerCase().contains(keyword)) { + return "用户名包含关键字"; + } + } + return "ok"; + } + + public static Boolean valid(String userName) { + //用户名规则 + String check = checkp(userName); + //用户名是否包含关键字 + String checkKeyword = checkKeyword(userName); + if (!"ok".equals(check)) { + throw new ResultException(check); + } else if (!"ok".equals(checkKeyword)) { + throw new ResultException(checkKeyword); + } else { + return true; + } + } +} diff --git a/src/main/java/com/ydool/common/utils/PasswordUtil.java b/src/main/java/com/ydool/common/utils/PasswordUtil.java index b1cf2e2..12ac6bb 100644 --- a/src/main/java/com/ydool/common/utils/PasswordUtil.java +++ b/src/main/java/com/ydool/common/utils/PasswordUtil.java @@ -1,5 +1,8 @@ package com.ydool.common.utils; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.util.StringUtils; +import com.ydool.common.exception.ResultException; import org.springframework.util.DigestUtils; import javax.crypto.Cipher; @@ -7,13 +10,284 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.DESKeySpec; import javax.crypto.spec.IvParameterSpec; import java.security.Key; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; import java.util.regex.Pattern; public class PasswordUtil { - public static Boolean valid(String password) { - String regexp = "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,24}$"; - return Pattern.matches(regexp, password); + /*** + * 描述: 三个或者三个以上相同 + * + * @param pwd 密码 + * @return String + */ + public static String check3(String pwd) { + + String regx = "^.*(.)\\1{2}.*$"; + Matcher m = null; + Pattern p = null; + p = Pattern.compile(regx); + m = p.matcher(pwd); + if (m.matches()) { + return "密码包含三个或者三个以上相同"; + } else { + return "ok"; + + } + + } + + /*** + * 描述: 验证生日 、身份证 + * + * @param pwd 密码 + * @return String + */ + public static String checkBirthday(String pwd) { + String birthday = "(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})(((0[13578]|1[02])(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))0229)"; + + Pattern pattern = Pattern.compile(birthday); + Matcher matcher = pattern.matcher(pwd); + + if (matcher.find()) { + return "密码包含生日或者身份证"; + } else { + return "ok"; + } + + } + + /*** + * 描述: 密码规则 + * + * @param pwd 密码 + * @return String + */ + public static String checkp(String pwd) { + String str = "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)(?=.*[@$!%*#?&])[A-Za-z\\d@$!%*#?&]{18,36}$"; + if (!pwd.matches(str)) { + return "密码至少由18位及以上大小写字母、数字及特殊字符等混合、随机组成(至少包括数字、小写字母、大写字母和特殊符号各一个),最长36位"; + } else { + return "ok"; + } + + } + + /*** + * 描述: 密码是否密码包含关键字 + * + * @param pwd 密码 + * @return String + */ + public static String checkKeyword(String pwd) { + //忽略大小写关键字为admin,system,ydool,833457,6500189 + String[] keywords = {"admin", "system", "ydool", "833457", "6500189"}; + for (String keyword : keywords) { + if (pwd.toLowerCase().contains(keyword)) { + return "密码包含关键字"; + } + } + return "ok"; + } + + + /*** + * 描述: 验证密码 + * + * @param pwd 密码 + * @return String + */ + public static Boolean valid(String pwd) { + //密码规则 + String check = checkp(pwd); + //键盘上连续3位或者以上 + String rsThree = validateKey(pwd); + String repeat = checkRepeat(pwd); + //密码包含生日 + String checkBirthday = checkBirthday(pwd); + //三个或者三个以上相同 + String check3 = check3(pwd); + //密码包含手机号 + String checkMobile = checkMobile(pwd); + //密码包含固定电话 + String checkPhone = checkPhone(pwd); + //密码包含关键字 + String checkKeyword = checkKeyword(pwd); + + if (!"ok".equals(check)) { + throw new ResultException(check); + } else if (!"ok".equals(rsThree)) { + throw new ResultException(rsThree); + } else if (!"ok".equals(repeat)) { + throw new ResultException(repeat); + } else if (!"ok".equals(checkBirthday)) { + throw new ResultException(checkBirthday); + } else if (!"ok".equals(check3)) { + throw new ResultException(check3); + } else if (!"ok".equals(checkMobile)) { + throw new ResultException(checkMobile); + } else if (!"ok".equals(checkPhone)) { + throw new ResultException(checkPhone); + } else { + return true; + } + + } + + /*** + * 描述: 密码是否密码包含手机号 + * + * @param sParam 密码 + * @return String + */ + public static String checkMobile(String sParam) { + + if (sParam.length() <= 0) + return ""; + Pattern pattern = Pattern.compile("(1|861)(3|4|5|6||7|8|9)\\d{9}$*"); + Matcher matcher = pattern.matcher(sParam); + StringBuffer bf = new StringBuffer(); + while (matcher.find()) { + bf.append(matcher.group()).append(","); + } + int len = bf.length(); + if (len > 0) { + bf.deleteCharAt(len - 1); + } + if (StrUtil.isNotBlank(bf.toString())) { + return "密码包含手机号"; + } else { + return "ok"; + } + } + + /*** + * 描述: 密码包含固定电话 + * + * @param content 电话 + * @return String + */ + public static String checkPhone(String content) { + List list = new ArrayList<>(); + Pattern p = Pattern.compile("\\d{3}-\\d{8}|\\d{4}-\\d{6}|\\d{7}|\\d{8}"); + Matcher matcher = p.matcher(content); + while (matcher.find()) { + String n = matcher.group(0).toString(); + list.add(n); + } + if (!list.isEmpty()) { + return "密码包含固定电话"; + } else { + return "ok"; + } + } + + /*** + * 描述: 密码不得密码包含键盘上任意连续的三个字符或shift转换字符 + * + * @param str 字符串 + * @return String + */ + public static String validateKey(String str) { + + //定义横向穷举 + String[][] keyCode = { + {"`~·", "1=", "2@@", "3#", "4$￥", "5%", "6^……", "7&", "8*", "9(（", "0）)", "-_", "=+"}, + {" ", "qQ", "wW", "eE", "rR", "tT", "yY", "uU", "iI", "oO", "pP", "[{【", "]}】", "\\|、"}, + {" ", "aA", "sS", "dD", "fF", "gG", "hH", "jJ", "kK", "lL", ";:", "\'\"’“"}, + {" ", "zZ", "xX", "cC", "vV", "bB", "nN", "mM", ",《<", ".>》", "/?？"} + }; + + //找出给出的字符串，每个字符，在坐标系中的位置。 + char[] c = str.toCharArray(); + List x = new ArrayList(); + List y = new ArrayList(); + for (int i = 0; i < c.length; i++) { + char temp = c[i]; + toHere: + for (int j = 0; j < keyCode.length; j++) { + for (int k = 0; k < keyCode[j].length; k++) { + String jk = keyCode[j][k]; + if (jk.contains(String.valueOf(temp))) { + x.add(j); + y.add(k); + break toHere; + } + } + } + } + boolean flag = false; + for (int i = 0; i < x.size() - 2; i++) { + // 如果X一致，那么就是在一排 + if (x.get(i) == x.get(i + 1) && x.get(i + 1) == x.get(i + 2)) {//四者在同一行上 + if (y.get(i) > y.get(i + 2)) { + if (y.get(i) - 1 == y.get(i + 1) && y.get(i) - 2 == y.get(i + 2)) { + flag = true; + break; + } + } else { + if (y.get(i) + 1 == y.get(i + 1) && y.get(i) + 2 == y.get(i + 2)) { + flag = true; + break; + } + } + + } else if (x.get(i) != x.get(i + 1) + && x.get(i + 1) != x.get(i + 2) + && x.get(i) != x.get(i + 2) + ) {//四者均不在同一行上,但是如果y相同，说明是一列 + if (y.get(i) == y.get(i + 1) && y.get(i + 1) == y.get(i + 2)) { + flag = true; + break; + } + } + + } + if (flag) { + return "密码不能连续三个或者三个以上字符"; + + } else { + return "ok"; + } + } + + /** + * 转码 + * + * @param c 字符 + * @return 编码 + */ + public static int getUnicode(char c) { + String returnUniCode = null; + returnUniCode = String.valueOf((int) c); + return Integer.parseInt(returnUniCode); + } + + /*** + * 描述: 不能连续字符（如123、abc）连续3位或3位以上 + * + * @param str 字符串 + * @return String + */ + public static String checkRepeat(String str) { + String[] arr = str.split(""); + boolean flag = false; + for (int i = 1; i < arr.length - 1; i++) { + int firstIndex = getUnicode(arr[i - 1].charAt(0)); + int secondIndex = getUnicode(arr[i].charAt(0)); + int thirdIndex = getUnicode(arr[i + 1].charAt(0)); + if ((thirdIndex - secondIndex == 1) && (secondIndex - firstIndex == 1)) { + flag = true; + } + } + if (flag) { + return "密码不能连续3字母"; + + } else { + return "ok"; + } } public static String password(String salt, String src){ diff --git a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java index b48c446..6c1f97d 100644 --- a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java @@ -118,7 +118,7 @@ public class AuthServiceImpl extends BaseService implements IA //是否需要强制修改密码 result.set("need_init_password", password.equals(ConfigCache.getStr(ConfigCache.USER_INIT_PASSWORD, - "888888")) ? true : false); + "Siwhnd!@Lc2349#!Rdisabled")) ? true : false); return AjaxResult.ok().data(result); } else { StpUtil.logout(); diff --git a/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java b/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java index 06384c6..1c9edc9 100644 --- a/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/ydool/system/service/impl/UserServiceImpl.java @@ -15,6 +15,7 @@ import com.ydool.common.base.BaseService; import com.ydool.common.cache.ConfigCache; import com.ydool.common.data.dto.AjaxResult; import com.ydool.common.utils.CodecUtils; +import com.ydool.common.utils.LoginNameUtil; import com.ydool.common.utils.PasswordUtil; import com.ydool.common.utils.TreeMapUtil; import com.ydool.system.entity.Menu; @@ -62,14 +63,12 @@ public class UserServiceImpl extends BaseService implements IU String message = checkUser("", userRequest); if (StrUtil.isNotBlank(message)) return AjaxResult.fail(message); User user = BeanUtil.copyProperties(userRequest, User.class); - user.setPhone(CodecUtils.encrypt(user.getPhone())); - - String initPassword = ConfigCache.getStr(ConfigCache.USER_INIT_PASSWORD, "888888"); + String initPassword = ConfigCache.getStr(ConfigCache.USER_INIT_PASSWORD, "Siwhnd!@Lc2349#!Rdisabled"); + PasswordUtil.valid(initPassword); user.setSalt(RandomUtil.randomString(6)); user.setPassword(PasswordUtil.password(user.getSalt(), initPassword)); user.setLastUpdatePwd(LocalDateTime.now()); - boolean flag = save(user); return flag ? AjaxResult.ok().msg("保存成功") : AjaxResult.fail("保存失败"); } @@ -191,7 +190,8 @@ public class UserServiceImpl extends BaseService implements IU User user = getById(id); if (ObjectUtil.isNull(user)) return AjaxResult.fail("该用户不存在"); - String initPassword = ConfigCache.getStr(ConfigCache.USER_INIT_PASSWORD, "888888"); + String initPassword = ConfigCache.getStr(ConfigCache.USER_INIT_PASSWORD, "Siwhnd!@Lc2349#!Rdisabled"); + PasswordUtil.valid(initPassword); user.setSalt(RandomUtil.randomString(6)); user.setPassword(PasswordUtil.password(user.getSalt(), initPassword)); user.setLastUpdatePwd(LocalDateTime.now()); @@ -449,6 +449,7 @@ public class UserServiceImpl extends BaseService implements IU ); if (ObjectUtil.isNotNull(user)) return "登录账号不能重复"; + LoginNameUtil.valid(userRequest.getLoginName()); return null; } } diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml new file mode 100644 index 0000000..fd90ac2 --- /dev/null +++ b/src/main/resources/ehcache.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..98f54a6 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + DEBUG + + + ${LOG_PATTERN} + + + + + + + INFO + + + ${LOG_PATH_INFO}/%d{yyyy-MM-dd}.log + + 30 + + + ${LOG_PATTERN} + + + + + + ERROR + + + ${LOG_PATH_ERROR}/%d{yyyy-MM-dd}.log + 90 + + + ${LOG_PATTERN} + + + + + + + + + + + \ No newline at end of file