From 239002ea7953108c619793d7268e4e4a5deae286 Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Wed, 12 Jul 2023 16:23:33 +0800 Subject: [PATCH] update --- src/main/java/com/ydool/common/utils/PasswordUtil.java | 2 +- .../java/com/ydool/system/service/impl/AuthServiceImpl.java | 4 ++-- src/main/resources/application.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ydool/common/utils/PasswordUtil.java b/src/main/java/com/ydool/common/utils/PasswordUtil.java index 3bf28c0..a4f4ad1 100644 --- a/src/main/java/com/ydool/common/utils/PasswordUtil.java +++ b/src/main/java/com/ydool/common/utils/PasswordUtil.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; public class PasswordUtil { public static Boolean valid(String password) { - String regexp = "^.*(?=.*\\d)(?=.*[A-Za-z])(?=.*[!@#$%^&*?_]).{6,}$"; + String regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*])[a-zA-Z\\d!@#$%^&*]{8,}$\n"; return Pattern.matches(regexp, password); } 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 c2846b5..987d86b 100644 --- a/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/ydool/system/service/impl/AuthServiceImpl.java @@ -146,7 +146,7 @@ public class AuthServiceImpl extends BaseService implements IA */ @Override public AjaxResult editPassword(String oldPassword, String newPassword) { - if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码需由长度不小于6位的英文、数字及特殊符号组成"); + if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符，并且长度至少为8位"); String loginId = StpUtil.getLoginIdAsString(); User user = getById(loginId); if (!user.getPassword().equals(PasswordUtil.password(user.getSalt(), oldPassword))) return AjaxResult.fail( @@ -168,7 +168,7 @@ public class AuthServiceImpl extends BaseService implements IA */ @Override public AjaxResult newPassword(String newPassword) { - if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码需由长度不小于6位的英文、数字及特殊符号组成"); + if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符，并且长度至少为8位"); String loginId = StpUtil.getLoginIdAsString(); String salt = RandomUtil.randomString(6); String password = PasswordUtil.password(salt, newPassword); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 788962f..28b6710 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,9 +16,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://10.0.0.54:3306/lc_oa?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + url: jdbc:mysql://localhost:3306/lc_oa?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root - password: zyy200916 + password: Wang09211108 druid: # 下面为连接池的补充设置，应用到上面所有数据源中 # 初始化大小，最小，最大