diff --git a/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java b/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java index a0008ce..e79ff68 100644 --- a/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java +++ b/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; @@ -128,10 +127,6 @@ public class RedisConfiguration { // 设置ObjectMapper访问权限 mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - // 记录序列化之后的数据类型，方便反序列化 - mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL); - // mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.EVERYTHING); - // 关闭默认的日期格式化方式，默认UTC日期格式 yyyy-MM-dd’T’HH:mm:ss.SSS mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); mapper.registerModule(timeModule); diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java index b5b38a5..e63e792 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java @@ -9,7 +9,7 @@ import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.system.PowerMapper; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.utils.JwtHelper; -import cn.bunny.services.utils.RoleUtil; +import cn.bunny.services.utils.system.RoleUtil; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index aee4485..fa557c2 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -13,7 +13,7 @@ import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageReceivedMapper; import cn.bunny.services.service.message.MessageReceivedService; -import cn.bunny.services.utils.UserUtil; +import cn.bunny.services.utils.system.UserUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index 61f83e6..bf829cd 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -19,7 +19,7 @@ import cn.bunny.services.mapper.message.MessageReceivedMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.service.message.MessageReceivedService; import cn.bunny.services.service.message.MessageService; -import cn.bunny.services.utils.UserUtil; +import cn.bunny.services.utils.system.UserUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java index d292cf8..093a172 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java @@ -14,9 +14,9 @@ import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.system.FilesMapper; import cn.bunny.services.service.system.FilesService; -import cn.bunny.services.utils.FileUtil; import cn.bunny.services.utils.minio.MinioProperties; import cn.bunny.services.utils.minio.MinioUtil; +import cn.bunny.services.utils.system.FileUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java index 362316a..29e9ef3 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java @@ -8,7 +8,7 @@ import cn.bunny.services.mapper.system.RolePowerMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import cn.bunny.services.service.system.RolePowerService; -import cn.bunny.services.utils.RoleUtil; +import cn.bunny.services.utils.system.RoleUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index 18e6bff..05e39b4 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -14,7 +14,7 @@ import cn.bunny.services.mapper.system.RolePowerMapper; import cn.bunny.services.mapper.system.RouterRoleMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import cn.bunny.services.service.system.RoleService; -import cn.bunny.services.utils.RoleUtil; +import cn.bunny.services.utils.system.RoleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index 28507ff..d82177c 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -20,8 +20,8 @@ import cn.bunny.services.mapper.system.RolePowerMapper; import cn.bunny.services.mapper.system.RouterMapper; import cn.bunny.services.mapper.system.RouterRoleMapper; import cn.bunny.services.service.system.RouterService; -import cn.bunny.services.utils.RoleUtil; -import cn.bunny.services.utils.RouterServiceUtil; +import cn.bunny.services.utils.system.RoleUtil; +import cn.bunny.services.utils.system.RouterServiceUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index 2252c68..77bf8d0 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -11,7 +11,7 @@ import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import cn.bunny.services.service.system.UserRoleService; -import cn.bunny.services.utils.UserUtil; +import cn.bunny.services.utils.system.UserUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index 8d5200b..e0fc973 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -26,13 +26,13 @@ import cn.bunny.services.mapper.system.UserRoleMapper; import cn.bunny.services.service.system.FilesService; import cn.bunny.services.service.system.UserService; import cn.bunny.services.utils.JwtHelper; -import cn.bunny.services.utils.UserUtil; import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate; import cn.bunny.services.utils.ip.IpUtil; import cn.bunny.services.utils.login.DefaultLoginStrategy; import cn.bunny.services.utils.login.EmailLoginStrategy; import cn.bunny.services.utils.login.LoginContext; import cn.bunny.services.utils.login.LoginStrategy; +import cn.bunny.services.utils.system.UserUtil; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/utils/JwtHelper.java b/service/src/main/java/cn/bunny/services/utils/JwtHelper.java index e76602e..87c3a16 100644 --- a/service/src/main/java/cn/bunny/services/utils/JwtHelper.java +++ b/service/src/main/java/cn/bunny/services/utils/JwtHelper.java @@ -83,6 +83,7 @@ public class JwtHelper { * @return token */ public static String createTokenWithMap(Map map, String tokenSignKey) { + return Jwts.builder() .subject(subject) .expiration(time) @@ -239,18 +240,8 @@ public class JwtHelper { } } - /** - * 根据token获取主题 - * - * @param token token - * @return 主题 - */ - public static String getSubjectByToken(String token) { - return getSubjectByTokenHandler(token, tokenSignKey); - } - @Nullable - private static String getSubjectByTokenHandler(String token, String tokenSignKey) { + private static String getSubjectByTokenHandler(String token) { try { if (!StringUtils.hasText(token)) throw new AuthCustomerException(ResultCodeEnum.TOKEN_PARSING_FAILED); Jws claimsJws = Jwts.parser().verifyWith(key).build().parseSignedClaims(token); @@ -269,8 +260,8 @@ public class JwtHelper { * @param token token * @return 主题 */ - public static String getSubjectByToken(String token, String tokenSignKey) { - return getSubjectByTokenHandler(token, tokenSignKey); + public static String getSubjectByToken(String token) { + return getSubjectByTokenHandler(token); } /** @@ -317,27 +308,16 @@ public class JwtHelper { * @return 是否过期 */ public static boolean isExpired(String token) { - return isExpiredUtil(token, tokenSignKey); - } - - /** - * 判断token是否过期 - * - * @param token token - * @return 是否过期 - */ - public static boolean isExpired(String token, String tokenSignKey) { - return isExpiredUtil(token, tokenSignKey); + return isExpiredUtil(token); } /** * 判断是否过期 * - * @param token token - * @param tokenSignKey key值 + * @param token token * @return 是否过期 */ - private static boolean isExpiredUtil(String token, String tokenSignKey) { + private static boolean isExpiredUtil(String token) { try { Jws claimsJws = Jwts.parser().verifyWith(key).build().parseSignedClaims(token); Date expiration = claimsJws.getPayload().getExpiration(); diff --git a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java index 71d9c2b..72f598e 100644 --- a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java @@ -12,14 +12,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.mail.MessagingException; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.List; -@Component public abstract class AbstractSenderEmailTemplate { - @Autowired private EmailUsersMapper emailUsersMapper; @@ -38,7 +35,10 @@ public abstract class AbstractSenderEmailTemplate { Long emailUser = emailTemplate.getEmailUser(); EmailUsers emailUsers; if (emailUser == null) { + // 如果用户不存在就是用默认用户进行邮件发送 emailUsers = emailUsersMapper.selectOne(Wrappers.lambdaQuery().eq(EmailUsers::getIsDefault, true)); + + // 默认发送用户也不存在 if (emailUsers == null) throw new AuthCustomerException(ResultCodeEnum.EMAIL_USER_IS_EMPTY); } else { emailUsers = emailUsersMapper.selectOne(Wrappers.lambdaQuery().eq(EmailUsers::getId, emailUser)); diff --git a/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java index 469b92c..89cdff8 100644 --- a/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java @@ -3,15 +3,17 @@ package cn.bunny.services.utils.email; import cn.bunny.dao.entity.system.EmailTemplate; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.HashMap; @Component public class ConcreteSenderEmailTemplate extends AbstractSenderEmailTemplate { - @Autowired - private EmailTemplateMapper emailTemplateMapper; + private final EmailTemplateMapper emailTemplateMapper; + + public ConcreteSenderEmailTemplate(EmailTemplateMapper emailTemplateMapper) { + this.emailTemplateMapper = emailTemplateMapper; + } /** * 发送邮件模板 diff --git a/service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java b/service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java index 1f1bbc3..bd0f463 100644 --- a/service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/ip/IpUtil.java @@ -14,6 +14,9 @@ import java.net.InetAddress; import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * 用户请求的IP地址转成归属地 + */ @Slf4j public class IpUtil { diff --git a/service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java b/service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java index e881d95..90e1855 100644 --- a/service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/mail/MailSenderUtil.java @@ -12,6 +12,9 @@ import org.springframework.web.multipart.MultipartFile; import java.util.Objects; import java.util.Properties; +/** + * 邮件发送工具 + */ public class MailSenderUtil { private MailSenderUtil() { // 私有化构造器 diff --git a/service/src/main/java/cn/bunny/services/utils/mail/template-propties b/service/src/main/java/cn/bunny/services/utils/mail/template-propties index cc51c94..b084c0f 100644 --- a/service/src/main/java/cn/bunny/services/utils/mail/template-propties +++ b/service/src/main/java/cn/bunny/services/utils/mail/template-propties @@ -1,5 +1,6 @@ Configuration example +# 在配置文件中的参考 mail: host: smtp.qq.com # 邮箱地址 port: 465 # 邮箱端口号 diff --git a/service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java b/service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java index 4ba6d6e..f637f2e 100644 --- a/service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java +++ b/service/src/main/java/cn/bunny/services/utils/minio/MinioProperties.java @@ -2,7 +2,6 @@ package cn.bunny.services.utils.minio; import io.minio.MinioClient; import lombok.Data; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -12,16 +11,15 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = "bunny.minio") @ConditionalOnProperty(name = "bunny.minio.bucket-name")// 当属性有值时这个配置才生效 @Data -@Slf4j public class MinioProperties { - // 地址 + /* 地址 */ private String endpointUrl; - // 访问秘钥 + /* 访问秘钥 */ private String accessKey; - // 私有秘钥 + /* 私有秘钥 */ private String secretKey; - // 桶名称 + /* 桶名称 */ private String bucketName; @Bean diff --git a/service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java b/service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java index a91868f..783bf60 100644 --- a/service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/minio/MinioUtil.java @@ -8,7 +8,6 @@ import io.minio.*; import io.minio.messages.DeleteError; import io.minio.messages.DeleteObject; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -22,16 +21,19 @@ import java.util.UUID; /** * Minio操作工具类 简化操作步骤 - * By：Bunny0212 + * 自定义封装 */ @Component @Slf4j public class MinioUtil { - @Autowired - private MinioProperties properties; + private final MinioProperties properties; - @Autowired - private MinioClient minioClient; + private final MinioClient minioClient; + + public MinioUtil(MinioProperties properties, MinioClient minioClient) { + this.properties = properties; + this.minioClient = minioClient; + } /** * 获取Minio文件路径 diff --git a/service/src/main/java/cn/bunny/services/utils/FileUtil.java b/service/src/main/java/cn/bunny/services/utils/system/FileUtil.java similarity index 80% rename from service/src/main/java/cn/bunny/services/utils/FileUtil.java rename to service/src/main/java/cn/bunny/services/utils/system/FileUtil.java index 37ba6cf..7d0964a 100644 --- a/service/src/main/java/cn/bunny/services/utils/FileUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/system/FileUtil.java @@ -1,11 +1,16 @@ -package cn.bunny.services.utils; +package cn.bunny.services.utils.system; -import org.springframework.stereotype.Component; -@Component +/* + * 文件工具类 + * 格式化字节大小 + */ public class FileUtil { /** - * * 获取文件大小字符串 + * 获取文件大小字符串 + * + * @param fileSize 文件大小 + * @return 格式化后文件大小 */ public static String getSize(Long fileSize) { double fileSizeInKB = fileSize / 1024.00; diff --git a/service/src/main/java/cn/bunny/services/utils/RoleUtil.java b/service/src/main/java/cn/bunny/services/utils/system/RoleUtil.java similarity index 98% rename from service/src/main/java/cn/bunny/services/utils/RoleUtil.java rename to service/src/main/java/cn/bunny/services/utils/system/RoleUtil.java index 7dc9a91..7e2571f 100644 --- a/service/src/main/java/cn/bunny/services/utils/RoleUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/system/RoleUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.services.utils; +package cn.bunny.services.utils.system; import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.entity.system.AdminUser; diff --git a/service/src/main/java/cn/bunny/services/utils/RouterServiceUtil.java b/service/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java similarity index 95% rename from service/src/main/java/cn/bunny/services/utils/RouterServiceUtil.java rename to service/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java index 1cc3a37..ce18611 100644 --- a/service/src/main/java/cn/bunny/services/utils/RouterServiceUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.services.utils; +package cn.bunny.services.utils.system; import cn.bunny.dao.vo.system.router.UserRouterVo; import org.jetbrains.annotations.NotNull; diff --git a/service/src/main/java/cn/bunny/services/utils/UserUtil.java b/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java similarity index 90% rename from service/src/main/java/cn/bunny/services/utils/UserUtil.java rename to service/src/main/java/cn/bunny/services/utils/system/UserUtil.java index ed88da1..dfc0a24 100644 --- a/service/src/main/java/cn/bunny/services/utils/UserUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java @@ -1,4 +1,4 @@ -package cn.bunny.services.utils; +package cn.bunny.services.utils.system; import cn.bunny.dao.constant.LocalDateTimeConstant; import cn.bunny.dao.constant.RedisUserConstant; @@ -13,11 +13,12 @@ import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.mapper.system.PowerMapper; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.mapper.system.UserMapper; +import cn.bunny.services.utils.JwtHelper; import cn.bunny.services.utils.ip.IpUtil; import cn.bunny.services.utils.minio.MinioUtil; import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -33,25 +34,24 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +@RequiredArgsConstructor @Component public class UserUtil { - @Autowired - private PowerMapper powerMapper; + private final MinioUtil minioUtil; + private final PowerMapper powerMapper; + private final RoleMapper roleMapper; + private final UserMapper userMapper; + private final UserLoginLogMapper userLoginLogMapper; + private final RedisTemplate redisTemplate; - @Autowired - private RoleMapper roleMapper; - - @Autowired - private UserMapper userMapper; - - @Autowired - private UserLoginLogMapper userLoginLogMapper; - - @Autowired - private RedisTemplate redisTemplate; - - @Autowired - private MinioUtil minioUtil; + // public UserUtil(MinioUtil minioUtil, PowerMapper powerMapper, RoleMapper roleMapper, UserMapper userMapper, UserLoginLogMapper userLoginLogMapper, RedisTemplate redisTemplate) { + // this.minioUtil = minioUtil; + // this.powerMapper = powerMapper; + // this.roleMapper = roleMapper; + // this.userMapper = userMapper; + // this.userLoginLogMapper = userLoginLogMapper; + // this.redisTemplate = redisTemplate; + // } /** * 构建登录用户返回对象 diff --git a/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java b/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java index bc4ae2a..cdda4b1 100644 --- a/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java +++ b/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java @@ -6,7 +6,7 @@ import cn.bunny.dao.entity.system.AdminUser; import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.mapper.system.UserMapper; -import cn.bunny.services.utils.UserUtil; +import cn.bunny.services.utils.system.UserUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/test/java/cn/bunny/services/service/impl/UserServiceImplTest.java b/service/src/test/java/cn/bunny/services/service/impl/UserServiceImplTest.java deleted file mode 100644 index 440ea8a..0000000 --- a/service/src/test/java/cn/bunny/services/service/impl/UserServiceImplTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.bunny.services.service.impl; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.security.crypto.password.PasswordEncoder; - -@SpringBootTest -class UserServiceImplTest { - - @Autowired - private PasswordEncoder passwordEncoder; - - @Test - void updateUserPasswordByAdmin() { - String encode = passwordEncoder.encode("123456"); - System.out.println(encode); - } -} \ No newline at end of file diff --git a/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java b/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java index c7ddb6a..016f281 100644 --- a/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java +++ b/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.crypto.password.PasswordEncoder; import java.util.HashMap; @@ -14,9 +15,18 @@ class ConcreteSenderEmailTemplateTest extends AbstractSenderEmailTemplate { @Autowired private EmailTemplateMapper emailTemplateMapper; + @Autowired + private PasswordEncoder passwordEncoder; + @Test void sendEmailTemplate() { EmailTemplate emailTemplate = emailTemplateMapper.selectOne(Wrappers.lambdaQuery().eq(EmailTemplate::getId, 1791870020197625858L)); - sendEmail("1319900154@qq.com", emailTemplate, new HashMap<>()); + sendEmail("xaher94124@birige.com", emailTemplate, new HashMap<>()); + } + + @Test + void updateUserPasswordByAdmin() { + String encode = passwordEncoder.encode("123456"); + System.out.println(encode); } } \ No newline at end of file