diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java index 2b22476c..7e60c41f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java @@ -66,15 +66,4 @@ public class SecureUtils { public static String decryptByRsaPrivateKey(String data, String privateKey) { return new String(SecureUtil.rsa(privateKey, null).decrypt(Base64.decode(data), KeyType.PrivateKey)); } - - /** - * MD5 加密 - * - * @param data 要加密的内容 - * @param salt 盐 - * @return 加密后的内容 - */ - public static String md5Salt(String data, String salt) { - return SecureUtil.md5(SecureUtil.md5(data) + salt); - } } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java index 7e66ba34..be7674b0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -27,6 +27,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthUser; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import top.charles7c.continew.admin.auth.model.resp.MetaResp; import top.charles7c.continew.admin.auth.model.resp.RouteResp; @@ -39,7 +40,6 @@ import top.charles7c.continew.admin.common.enums.GenderEnum; import top.charles7c.continew.admin.common.enums.MenuTypeEnum; import top.charles7c.continew.admin.common.enums.MessageTypeEnum; import top.charles7c.continew.admin.common.model.dto.LoginUser; -import top.charles7c.continew.admin.common.util.SecureUtils; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.enums.MessageTemplateEnum; import top.charles7c.continew.admin.system.model.entity.DeptDO; @@ -77,13 +77,13 @@ public class LoginServiceImpl implements LoginService { private final UserRoleService userRoleService; private final UserSocialService userSocialService; private final MessageService messageService; + private final PasswordEncoder passwordEncoder; @Override public String accountLogin(String username, String password) { UserDO user = userService.getByUsername(username); CheckUtils.throwIfNull(user, "用户名或密码不正确"); - Long userId = user.getId(); - CheckUtils.throwIfNotEqual(SecureUtils.md5Salt(password, userId.toString()), user.getPassword(), "用户名或密码不正确"); + CheckUtils.throwIf(!passwordEncoder.matches(password, user.getPassword()), "用户名或密码不正确"); this.checkUserStatus(user); return this.login(user); } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java index 00935b61..da0300c3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java @@ -27,6 +27,7 @@ import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.FileStorageService; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -34,7 +35,6 @@ import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.common.constant.FileConstants; import top.charles7c.continew.admin.common.constant.SysConstants; import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; -import top.charles7c.continew.admin.common.util.SecureUtils; import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.admin.system.mapper.UserMapper; import top.charles7c.continew.admin.system.model.entity.UserDO; @@ -72,6 +72,7 @@ public class UserServiceImpl extends BaseServiceImpl 0, "手机号已绑定其他账号,请更换其他手机号"); CheckUtils.throwIfEqual(newPhone, user.getPhone(), "新手机号不能与当前手机号相同"); @@ -223,7 +224,7 @@ public class UserServiceImpl extends BaseServiceImpl 0, "邮箱已绑定其他账号,请更换其他邮箱"); CheckUtils.throwIfEqual(newEmail, user.getEmail(), "新邮箱不能与当前邮箱相同"); @@ -234,7 +235,7 @@ public class UserServiceImpl extends BaseServiceImpl