diff --git a/aurora-springboot/src/main/java/com/aurora/aspect/ExceptionLogAspect.java b/aurora-springboot/src/main/java/com/aurora/aspect/ExceptionLogAspect.java index b64124c..9dbd585 100644 --- a/aurora-springboot/src/main/java/com/aurora/aspect/ExceptionLogAspect.java +++ b/aurora-springboot/src/main/java/com/aurora/aspect/ExceptionLogAspect.java @@ -3,8 +3,8 @@ package com.aurora.aspect; import com.alibaba.fastjson.JSON; import com.aurora.entity.ExceptionLog; import com.aurora.event.ExceptionLogEvent; -import com.aurora.utils.ExceptionUtils; -import com.aurora.utils.IpUtils; +import com.aurora.util.ExceptionUtil; +import com.aurora.util.IpUtil; import io.swagger.annotations.ApiOperation; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterThrowing; @@ -65,12 +65,12 @@ public class ExceptionLogAspect { exceptionLog.setOptDesc(""); } // 异常信息 - exceptionLog.setExceptionInfo(ExceptionUtils.getTrace(e)); + exceptionLog.setExceptionInfo(ExceptionUtil.getTrace(e)); // ip地址 - String ipAddress = IpUtils.getIpAddress(request); + String ipAddress = IpUtil.getIpAddress(request); exceptionLog.setIpAddress(ipAddress); // ip来源 - exceptionLog.setIpSource(IpUtils.getIpSource(ipAddress)); + exceptionLog.setIpSource(IpUtil.getIpSource(ipAddress)); // 事件发布 applicationContext.publishEvent(new ExceptionLogEvent(exceptionLog)); } diff --git a/aurora-springboot/src/main/java/com/aurora/aspect/OperationLogAspect.java b/aurora-springboot/src/main/java/com/aurora/aspect/OperationLogAspect.java index 56c1f51..43ee7aa 100644 --- a/aurora-springboot/src/main/java/com/aurora/aspect/OperationLogAspect.java +++ b/aurora-springboot/src/main/java/com/aurora/aspect/OperationLogAspect.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON; import com.aurora.annotation.OptLog; import com.aurora.entity.OperationLog; import com.aurora.event.OperationLogEvent; -import com.aurora.utils.IpUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.IpUtil; +import com.aurora.util.UserUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.aspectj.lang.JoinPoint; @@ -91,13 +91,13 @@ public class OperationLogAspect { // 返回结果 operationLog.setResponseData(JSON.toJSONString(keys)); // 请求用户ID - operationLog.setUserId(UserUtils.getUserDetailsDTO().getId()); + operationLog.setUserId(UserUtil.getUserDetailsDTO().getId()); // 请求用户 - operationLog.setNickname(UserUtils.getUserDetailsDTO().getNickname()); + operationLog.setNickname(UserUtil.getUserDetailsDTO().getNickname()); // 请求IP - String ipAddress = IpUtils.getIpAddress(request); + String ipAddress = IpUtil.getIpAddress(request); operationLog.setIpAddress(ipAddress); - operationLog.setIpSource(IpUtils.getIpSource(ipAddress)); + operationLog.setIpSource(IpUtil.getIpSource(ipAddress)); // 请求uri operationLog.setOptUri(request.getRequestURI()); // 事件发布 diff --git a/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java b/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java index b781bb0..d6f8f38 100644 --- a/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java +++ b/aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java @@ -2,7 +2,7 @@ package com.aurora.consumer; import com.alibaba.fastjson.JSON; import com.aurora.model.dto.EmailDTO; -import com.aurora.utils.EmailUtils; +import com.aurora.util.EmailUtil; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; @@ -21,16 +21,16 @@ import static com.aurora.constant.MQPrefixConstant.EMAIL_QUEUE; public class CommentNoticeConsumer { @Autowired - private EmailUtils emailUtils; + private EmailUtil emailUtil; @RabbitHandler public void process(byte[] data) { EmailDTO mailDTO = JSON.parseObject(new String(data), EmailDTO.class); if (CAPTCHA.equals(mailDTO.getSubject()) || CHECK_REMIND.equals(mailDTO.getSubject())) { - emailUtils.sendSimpleMail(mailDTO); + emailUtil.sendSimpleMail(mailDTO); } if (COMMENT_REMIND.equals(mailDTO.getSubject())) { - emailUtils.sendHtmlMail(mailDTO); + emailUtil.sendHtmlMail(mailDTO); } } } diff --git a/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java b/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java index 6e412e8..321dd1c 100644 --- a/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java +++ b/aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java @@ -5,7 +5,7 @@ import com.aurora.model.dto.ArticleSearchDTO; import com.aurora.model.dto.MaxwellDataDTO; import com.aurora.entity.Article; import com.aurora.mapper.ElasticsearchMapper; -import com.aurora.utils.BeanCopyUtils; +import com.aurora.util.BeanCopyUtil; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +35,7 @@ public class MaxWellConsumer { case "insert": case "update": // 更新es文章 - elasticsearchMapper.save(BeanCopyUtils.copyObject(article, ArticleSearchDTO.class)); + elasticsearchMapper.save(BeanCopyUtil.copyObject(article, ArticleSearchDTO.class)); break; case "delete": // 删除文章 diff --git a/aurora-springboot/src/main/java/com/aurora/filter/JwtAuthenticationTokenFilter.java b/aurora-springboot/src/main/java/com/aurora/filter/JwtAuthenticationTokenFilter.java index 46f9df4..9f09195 100644 --- a/aurora-springboot/src/main/java/com/aurora/filter/JwtAuthenticationTokenFilter.java +++ b/aurora-springboot/src/main/java/com/aurora/filter/JwtAuthenticationTokenFilter.java @@ -3,7 +3,7 @@ package com.aurora.filter; import com.aurora.model.dto.UserDetailsDTO; import com.aurora.service.TokenService; -import com.aurora.utils.UserUtils; +import com.aurora.util.UserUtil; import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -30,7 +30,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) { UserDetailsDTO userDetailsDTO = tokenService.getUserDetailDTO(request); - if (Objects.nonNull(userDetailsDTO) && Objects.isNull(UserUtils.getAuthentication())) { + if (Objects.nonNull(userDetailsDTO) && Objects.isNull(UserUtil.getAuthentication())) { tokenService.renewToken(userDetailsDTO); UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetailsDTO, null, userDetailsDTO.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authenticationToken); diff --git a/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java b/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java index d419707..f4a4fd0 100644 --- a/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java @@ -7,8 +7,8 @@ import com.aurora.model.dto.UserInfoDTO; import com.aurora.entity.UserAuth; import com.aurora.mapper.UserAuthMapper; import com.aurora.service.TokenService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; @@ -34,7 +34,7 @@ public class AuthenticationSuccessHandlerImpl implements AuthenticationSuccessHa @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { - UserInfoDTO userLoginDTO = BeanCopyUtils.copyObject(UserUtils.getUserDetailsDTO(), UserInfoDTO.class); + UserInfoDTO userLoginDTO = BeanCopyUtil.copyObject(UserUtil.getUserDetailsDTO(), UserInfoDTO.class); if (Objects.nonNull(authentication)) { UserDetailsDTO userDetailsDTO = (UserDetailsDTO) authentication.getPrincipal(); String token = tokenService.createToken(userDetailsDTO); @@ -48,10 +48,10 @@ public class AuthenticationSuccessHandlerImpl implements AuthenticationSuccessHa @Async public void updateUserInfo() { UserAuth userAuth = UserAuth.builder() - .id(UserUtils.getUserDetailsDTO().getId()) - .ipAddress(UserUtils.getUserDetailsDTO().getIpAddress()) - .ipSource(UserUtils.getUserDetailsDTO().getIpSource()) - .lastLoginTime(UserUtils.getUserDetailsDTO().getLastLoginTime()) + .id(UserUtil.getUserDetailsDTO().getId()) + .ipAddress(UserUtil.getUserDetailsDTO().getIpAddress()) + .ipSource(UserUtil.getUserDetailsDTO().getIpSource()) + .lastLoginTime(UserUtil.getUserDetailsDTO().getLastLoginTime()) .build(); userAuthMapper.updateById(userAuth); } diff --git a/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java b/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java index 524efb1..3736f78 100644 --- a/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java +++ b/aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.aurora.annotation.AccessLimit; import com.aurora.service.RedisService; -import com.aurora.utils.IpUtils; +import com.aurora.util.IpUtil; import com.aurora.model.vo.Result; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +43,7 @@ public class AccessLimitInterceptor implements HandlerInterceptor { long seconds = accessLimit.seconds(); int maxCount = accessLimit.maxCount(); // 关于key的生成规则可以自己定义 本项目需求是对每个方法都加上限流功能，如果你只是针对ip地址限流，那么key只需要只用ip就好 - String key = IpUtils.getIpAddress(httpServletRequest) + hm.getMethod().getName(); + String key = IpUtil.getIpAddress(httpServletRequest) + hm.getMethod().getName(); // 从redis中获取用户访问的次数 try { // 此操作代表获取该key对应的值自增1后的结果 diff --git a/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java b/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java index dc979cb..1506bee 100644 --- a/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java +++ b/aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java @@ -1,7 +1,7 @@ package com.aurora.interceptor; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.aurora.utils.PageUtils; +import com.aurora.util.PageUtil; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; @@ -25,14 +25,14 @@ public class PaginationInterceptor implements HandlerInterceptor { String currentPage = request.getParameter(CURRENT); String pageSize = Optional.ofNullable(request.getParameter(SIZE)).orElse(DEFAULT_SIZE); if (!Objects.isNull(currentPage) && !StringUtils.isEmpty(currentPage)) { - PageUtils.setCurrentPage(new Page<>(Long.parseLong(currentPage), Long.parseLong(pageSize))); + PageUtil.setCurrentPage(new Page<>(Long.parseLong(currentPage), Long.parseLong(pageSize))); } return true; } @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { - PageUtils.remove(); + PageUtil.remove(); } } \ No newline at end of file diff --git a/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java b/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java index 38c9a8c..2281a60 100644 --- a/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java +++ b/aurora-springboot/src/main/java/com/aurora/quartz/AbstractQuartzJob.java @@ -4,8 +4,8 @@ import com.aurora.constant.ScheduleConstant; import com.aurora.entity.Job; import com.aurora.entity.JobLog; import com.aurora.mapper.JobLogMapper; -import com.aurora.utils.ExceptionUtils; -import com.aurora.utils.SpringUtils; +import com.aurora.util.ExceptionUtil; +import com.aurora.util.SpringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; @@ -74,12 +74,12 @@ public abstract class AbstractQuartzJob implements org.quartz.Job { jobLog.setJobMessage(jobLog.getJobName() + " 总共耗时：" + runMs + "毫秒"); if (e != null) { jobLog.setStatus(ZERO); - jobLog.setExceptionInfo(ExceptionUtils.getTrace(e)); + jobLog.setExceptionInfo(ExceptionUtil.getTrace(e)); } else { jobLog.setStatus(ONE); } // 写入数据库当中 - SpringUtils.getBean(JobLogMapper.class).insert(jobLog); + SpringUtil.getBean(JobLogMapper.class).insert(jobLog); } /** diff --git a/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java b/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java index e65f47b..616a296 100644 --- a/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java +++ b/aurora-springboot/src/main/java/com/aurora/quartz/AuroraQuartz.java @@ -9,8 +9,8 @@ import com.aurora.mapper.ElasticsearchMapper; import com.aurora.mapper.UniqueViewMapper; import com.aurora.mapper.UserAuthMapper; import com.aurora.service.*; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.IpUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.IpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -88,7 +88,7 @@ public class AuroraQuartz { .stream() .map(item -> { if (Objects.nonNull(item) && StringUtils.isNotBlank(item.getIpSource())) { - return IpUtils.getIpProvince(item.getIpSource()); + return IpUtil.getIpProvince(item.getIpSource()); } return UNKNOWN; }) @@ -141,7 +141,7 @@ public class AuroraQuartz { elasticsearchMapper.deleteAll(); List
articles = articleService.list(); for (Article article : articles) { - elasticsearchMapper.save(BeanCopyUtils.copyObject(article, ArticleSearchDTO.class)); + elasticsearchMapper.save(BeanCopyUtil.copyObject(article, ArticleSearchDTO.class)); } } } diff --git a/aurora-springboot/src/main/java/com/aurora/quartz/QuartzDisallowConcurrentExecution.java b/aurora-springboot/src/main/java/com/aurora/quartz/QuartzDisallowConcurrentExecution.java index ad5bc30..111607d 100644 --- a/aurora-springboot/src/main/java/com/aurora/quartz/QuartzDisallowConcurrentExecution.java +++ b/aurora-springboot/src/main/java/com/aurora/quartz/QuartzDisallowConcurrentExecution.java @@ -1,7 +1,7 @@ package com.aurora.quartz; import com.aurora.entity.Job; -import com.aurora.utils.JobInvokeUtils; +import com.aurora.util.JobInvokeUtil; import org.quartz.JobExecutionContext; /** @@ -11,6 +11,6 @@ import org.quartz.JobExecutionContext; public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob { @Override protected void doExecute(JobExecutionContext context, Job job) throws Exception { - JobInvokeUtils.invokeMethod(job); + JobInvokeUtil.invokeMethod(job); } } diff --git a/aurora-springboot/src/main/java/com/aurora/quartz/QuartzJobExecution.java b/aurora-springboot/src/main/java/com/aurora/quartz/QuartzJobExecution.java index 5cc1c39..1b76c14 100644 --- a/aurora-springboot/src/main/java/com/aurora/quartz/QuartzJobExecution.java +++ b/aurora-springboot/src/main/java/com/aurora/quartz/QuartzJobExecution.java @@ -1,7 +1,7 @@ package com.aurora.quartz; import com.aurora.entity.Job; -import com.aurora.utils.JobInvokeUtils; +import com.aurora.util.JobInvokeUtil; import org.quartz.JobExecutionContext; /** @@ -12,6 +12,6 @@ public class QuartzJobExecution extends AbstractQuartzJob { @Override protected void doExecute(JobExecutionContext context, Job job) throws Exception { - JobInvokeUtils.invokeMethod(job); + JobInvokeUtil.invokeMethod(job); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java index d797ab0..de9c645 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/ArticleServiceImpl.java @@ -19,9 +19,9 @@ import com.aurora.service.RedisService; import com.aurora.service.TagService; import com.aurora.strategy.context.SearchStrategyContext; import com.aurora.strategy.context.UploadStrategyContext; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -100,7 +100,7 @@ public class ArticleServiceImpl extends ServiceImpl impl .eq(Article::getIsDelete, 0) .eq(Article::getStatus, 1); CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> articleMapper.selectCount(queryWrapper)); - List articles = articleMapper.listArticles(PageUtils.getLimitCurrent(), PageUtils.getSize()); + List articles = articleMapper.listArticles(PageUtil.getLimitCurrent(), PageUtil.getSize()); return new PageResult<>(articles, asyncCount.get()); } @@ -109,7 +109,7 @@ public class ArticleServiceImpl extends ServiceImpl impl public PageResult listArticlesByCategoryId(Integer categoryId) { LambdaQueryWrapper
queryWrapper = new LambdaQueryWrapper
().eq(Article::getCategoryId, categoryId); CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> articleMapper.selectCount(queryWrapper)); - List articles = articleMapper.getArticlesByCategoryId(PageUtils.getLimitCurrent(), PageUtils.getSize(), categoryId); + List articles = articleMapper.getArticlesByCategoryId(PageUtil.getLimitCurrent(), PageUtil.getSize(), categoryId); return new PageResult<>(articles, asyncCount.get()); } @@ -123,7 +123,7 @@ public class ArticleServiceImpl extends ServiceImpl impl if (articleForCheck.getStatus().equals(2)) { Boolean isAccess; try { - isAccess = redisService.sIsMember(USER_ARTICLE_ACCESS + ":" + UserUtils.getUserDetailsDTO().getId(), articleId); + isAccess = redisService.sIsMember(USER_ARTICLE_ACCESS + ":" + UserUtil.getUserDetailsDTO().getId(), articleId); } catch (Exception exception) { throw new BizException(ARTICLE_ACCESS_FAIL); } @@ -167,7 +167,7 @@ public class ArticleServiceImpl extends ServiceImpl impl throw new BizException("文章不存在"); } if (article.getPassword().equals(articlePasswordVO.getArticlePassword())) { - redisService.sAdd(USER_ARTICLE_ACCESS + ":" + UserUtils.getUserDetailsDTO().getId(), articlePasswordVO.getArticleId()); + redisService.sAdd(USER_ARTICLE_ACCESS + ":" + UserUtil.getUserDetailsDTO().getId(), articlePasswordVO.getArticleId()); } else { throw new BizException("密码错误"); } @@ -178,7 +178,7 @@ public class ArticleServiceImpl extends ServiceImpl impl public PageResult listArticlesByTagId(Integer tagId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().eq(ArticleTag::getTagId, tagId); CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> articleTagMapper.selectCount(queryWrapper)); - List articles = articleMapper.listArticlesByTagId(PageUtils.getLimitCurrent(), PageUtils.getSize(), tagId); + List articles = articleMapper.listArticlesByTagId(PageUtil.getLimitCurrent(), PageUtil.getSize(), tagId); return new PageResult<>(articles, asyncCount.get()); } @@ -187,7 +187,7 @@ public class ArticleServiceImpl extends ServiceImpl impl public PageResult listArchives() { LambdaQueryWrapper
queryWrapper = new LambdaQueryWrapper
().eq(Article::getIsDelete, 0).eq(Article::getStatus, 1); CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> articleMapper.selectCount(queryWrapper)); - List articles = articleMapper.listArchives(PageUtils.getLimitCurrent(), PageUtils.getSize()); + List articles = articleMapper.listArchives(PageUtil.getLimitCurrent(), PageUtil.getSize()); HashMap> map = new HashMap<>(); for (ArticleCardDTO article : articles) { LocalDateTime createTime = article.getCreateTime(); @@ -226,7 +226,7 @@ public class ArticleServiceImpl extends ServiceImpl impl @Override public PageResult listArticlesAdmin(ConditionVO conditionVO) { CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> articleMapper.countArticleAdmins(conditionVO)); - List articleAdminDTOs = articleMapper.listArticlesAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List articleAdminDTOs = articleMapper.listArticlesAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); Map viewsCountMap = redisService.zAllScore(ARTICLE_VIEWS_COUNT); articleAdminDTOs.forEach(item -> { Double viewsCount = viewsCountMap.get(item.getId()); @@ -242,11 +242,11 @@ public class ArticleServiceImpl extends ServiceImpl impl // 保存文章分类 Category category = saveArticleCategory(articleVO); // 保存或修改文章 - Article article = BeanCopyUtils.copyObject(articleVO, Article.class); + Article article = BeanCopyUtil.copyObject(articleVO, Article.class); if (Objects.nonNull(category)) { article.setCategoryId(category.getId()); } - article.setUserId(UserUtils.getUserDetailsDTO().getUserInfoId()); + article.setUserId(UserUtil.getUserDetailsDTO().getUserInfoId()); this.saveOrUpdate(article); // 保存文章标签 saveArticleTag(articleVO, article.getId()); @@ -295,7 +295,7 @@ public class ArticleServiceImpl extends ServiceImpl impl // 查询文章标签 List tagNames = tagMapper.listTagNamesByArticleId(articleId); // 封装数据 - ArticleAdminViewDTO articleAdminViewDTO = BeanCopyUtils.copyObject(article, ArticleAdminViewDTO.class); + ArticleAdminViewDTO articleAdminViewDTO = BeanCopyUtil.copyObject(article, ArticleAdminViewDTO.class); articleAdminViewDTO.setCategoryName(categoryName); articleAdminViewDTO.setTagNames(tagNames); return articleAdminViewDTO; diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java index 0d8358e..c180649 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/AuroraInfoServiceImpl.java @@ -7,8 +7,8 @@ import com.aurora.mapper.*; import com.aurora.service.AuroraInfoService; import com.aurora.service.RedisService; import com.aurora.service.UniqueViewService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.IpUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.IpUtil; import com.aurora.model.vo.AboutVO; import com.aurora.model.vo.WebsiteConfigVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -71,9 +71,9 @@ public class AuroraInfoServiceImpl implements AuroraInfoService { @Override public void report() { // 获取ip - String ipAddress = IpUtils.getIpAddress(request); + String ipAddress = IpUtil.getIpAddress(request); // 获取访问设备 - UserAgent userAgent = IpUtils.getUserAgent(request); + UserAgent userAgent = IpUtil.getUserAgent(request); Browser browser = userAgent.getBrowser(); OperatingSystem operatingSystem = userAgent.getOperatingSystem(); // 生成唯一用户标识 @@ -82,9 +82,9 @@ public class AuroraInfoServiceImpl implements AuroraInfoService { // 判断是否访问 if (!redisService.sIsMember(UNIQUE_VISITOR, md5)) { // 统计游客地域分布 - String ipSource = IpUtils.getIpSource(ipAddress); + String ipSource = IpUtil.getIpSource(ipAddress); if (StringUtils.isNotBlank(ipSource)) { - String ipProvince = IpUtils.getIpProvince(ipSource); + String ipProvince = IpUtil.getIpProvince(ipSource); redisService.hIncr(VISITOR_AREA, ipProvince, 1L); } else { redisService.hIncr(VISITOR_AREA, UNKNOWN, 1L); @@ -128,7 +128,7 @@ public class AuroraInfoServiceImpl implements AuroraInfoService { List uniqueViews = uniqueViewService.listUniqueViews(); List articleStatisticsDTOs = articleMapper.listArticleStatistics(); List categoryDTOs = categoryMapper.listCategories(); - List tagDTOs = BeanCopyUtils.copyList(tagMapper.selectList(null), TagDTO.class); + List tagDTOs = BeanCopyUtil.copyList(tagMapper.selectList(null), TagDTO.class); Map articleMap = redisService.zReverseRangeWithScore(ARTICLE_VIEWS_COUNT, 0, 4); AuroraAdminInfoDTO auroraAdminInfoDTO = AuroraAdminInfoDTO.builder() .articleStatisticsDTOs(articleStatisticsDTOs) diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/CategoryServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/CategoryServiceImpl.java index 129ac8d..1bb6f49 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/CategoryServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/CategoryServiceImpl.java @@ -9,8 +9,8 @@ import com.aurora.exception.BizException; import com.aurora.mapper.ArticleMapper; import com.aurora.mapper.CategoryMapper; import com.aurora.service.CategoryService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.CategoryVO; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; @@ -49,7 +49,7 @@ public class CategoryServiceImpl extends ServiceImpl i return new PageResult<>(); } // 分页查询分类列表 - List categoryList = categoryMapper.listCategoriesAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List categoryList = categoryMapper.listCategoriesAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(categoryList, count); } @@ -59,7 +59,7 @@ public class CategoryServiceImpl extends ServiceImpl i List categoryList = categoryMapper.selectList(new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), Category::getCategoryName, conditionVO.getKeywords()) .orderByDesc(Category::getId)); - return BeanCopyUtils.copyList(categoryList, CategoryOptionDTO.class); + return BeanCopyUtil.copyList(categoryList, CategoryOptionDTO.class); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java index 20e1c7f..ea31a38 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/CommentServiceImpl.java @@ -14,9 +14,9 @@ import com.aurora.mapper.TalkMapper; import com.aurora.mapper.UserInfoMapper; import com.aurora.service.AuroraInfoService; import com.aurora.service.CommentService; -import com.aurora.utils.HTMLUtils; -import com.aurora.utils.PageUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.HTMLUtil; +import com.aurora.util.PageUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.CommentVO; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; @@ -82,9 +82,9 @@ public class CommentServiceImpl extends ServiceImpl impl checkCommentVO(commentVO); WebsiteConfigDTO websiteConfig = auroraInfoService.getWebsiteConfig(); Integer isCommentReview = websiteConfig.getIsCommentReview(); - commentVO.setCommentContent(HTMLUtils.filter(commentVO.getCommentContent())); + commentVO.setCommentContent(HTMLUtil.filter(commentVO.getCommentContent())); Comment comment = Comment.builder() - .userId(UserUtils.getUserDetailsDTO().getUserInfoId()) + .userId(UserUtil.getUserDetailsDTO().getUserInfoId()) .replyUserId(commentVO.getReplyUserId()) .topicId(commentVO.getTopicId()) .commentContent(commentVO.getCommentContent()) @@ -93,7 +93,7 @@ public class CommentServiceImpl extends ServiceImpl impl .isReview(isCommentReview == TRUE ? FALSE : TRUE) .build(); commentMapper.insert(comment); - String fromNickname = UserUtils.getUserDetailsDTO().getNickname(); + String fromNickname = UserUtil.getUserDetailsDTO().getNickname(); if (websiteConfig.getIsEmailNotice().equals(TRUE)) { CompletableFuture.runAsync(() -> notice(comment, fromNickname)); } @@ -109,7 +109,7 @@ public class CommentServiceImpl extends ServiceImpl impl if (commentCount == 0) { return new PageResult<>(); } - List commentDTOs = commentMapper.listComments(PageUtils.getLimitCurrent(), PageUtils.getSize(), commentVO); + List commentDTOs = commentMapper.listComments(PageUtil.getLimitCurrent(), PageUtil.getSize(), commentVO); if (CollectionUtils.isEmpty(commentDTOs)) { return new PageResult<>(); } @@ -139,7 +139,7 @@ public class CommentServiceImpl extends ServiceImpl impl @Override public PageResult listCommentsAdmin(ConditionVO conditionVO) { CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> commentMapper.countComments(conditionVO)); - List commentBackDTOList = commentMapper.listCommentsAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List commentBackDTOList = commentMapper.listCommentsAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(commentBackDTOList, asyncCount.get()); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/ExceptionLogServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/ExceptionLogServiceImpl.java index 59c2ef3..a519d11 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/ExceptionLogServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/ExceptionLogServiceImpl.java @@ -4,8 +4,8 @@ import com.aurora.model.dto.ExceptionLogDTO; import com.aurora.entity.ExceptionLog; import com.aurora.mapper.ExceptionLogMapper; import com.aurora.service.ExceptionLogService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -22,11 +22,11 @@ public class ExceptionLogServiceImpl extends ServiceImpl listExceptionLogs(ConditionVO conditionVO) { - Page page = new Page<>(PageUtils.getCurrent(), PageUtils.getSize()); + Page page = new Page<>(PageUtil.getCurrent(), PageUtil.getSize()); Page exceptionLogPage = this.page(page, new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), ExceptionLog::getOptDesc, conditionVO.getKeywords()) .orderByDesc(ExceptionLog::getId)); - List exceptionLogDTOs = BeanCopyUtils.copyList(exceptionLogPage.getRecords(), ExceptionLogDTO.class); + List exceptionLogDTOs = BeanCopyUtil.copyList(exceptionLogPage.getRecords(), ExceptionLogDTO.class); return new PageResult<>(exceptionLogDTOs, (int) exceptionLogPage.getTotal()); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/FriendLinkServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/FriendLinkServiceImpl.java index d5c19b6..1e2fb87 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/FriendLinkServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/FriendLinkServiceImpl.java @@ -5,8 +5,8 @@ import com.aurora.model.dto.FriendLinkDTO; import com.aurora.entity.FriendLink; import com.aurora.mapper.FriendLinkMapper; import com.aurora.service.FriendLinkService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.FriendLinkVO; import com.aurora.model.vo.PageResult; @@ -29,22 +29,22 @@ public class FriendLinkServiceImpl extends ServiceImpl listFriendLinks() { List friendLinks = friendLinkMapper.selectList(null); - return BeanCopyUtils.copyList(friendLinks, FriendLinkDTO.class); + return BeanCopyUtil.copyList(friendLinks, FriendLinkDTO.class); } @Override public PageResult listFriendLinksAdmin(ConditionVO conditionVO) { - Page page = new Page<>(PageUtils.getCurrent(), PageUtils.getSize()); + Page page = new Page<>(PageUtil.getCurrent(), PageUtil.getSize()); Page friendLinkPage = friendLinkMapper.selectPage(page, new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), FriendLink::getLinkName, conditionVO.getKeywords())); - List friendLinkBackDTOs = BeanCopyUtils.copyList(friendLinkPage.getRecords(), FriendLinkAdminDTO.class); + List friendLinkBackDTOs = BeanCopyUtil.copyList(friendLinkPage.getRecords(), FriendLinkAdminDTO.class); return new PageResult<>(friendLinkBackDTOs, (int) friendLinkPage.getTotal()); } @Transactional(rollbackFor = Exception.class) @Override public void saveOrUpdateFriendLink(FriendLinkVO friendLinkVO) { - FriendLink friendLink = BeanCopyUtils.copyObject(friendLinkVO, FriendLink.class); + FriendLink friendLink = BeanCopyUtil.copyObject(friendLinkVO, FriendLink.class); this.saveOrUpdate(friendLink); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/JobLogServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/JobLogServiceImpl.java index 7c6f9bb..3125eaf 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/JobLogServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/JobLogServiceImpl.java @@ -4,8 +4,8 @@ import com.aurora.model.dto.JobLogDTO; import com.aurora.entity.JobLog; import com.aurora.mapper.JobLogMapper; import com.aurora.service.JobLogService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.JobLogSearchVO; import com.aurora.model.vo.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -39,9 +39,9 @@ public class JobLogServiceImpl extends ServiceImpl impleme JobLog::getCreateTime, jobLogSearchVO.getStartTime(), jobLogSearchVO.getEndTime()); - Page page = new Page<>(PageUtils.getCurrent(),PageUtils.getSize()); + Page page = new Page<>(PageUtil.getCurrent(), PageUtil.getSize()); Page jobLogPage = jobLogMapper.selectPage(page, queryWrapper); - List jobLogDTOs = BeanCopyUtils.copyList(jobLogPage.getRecords(), JobLogDTO.class); + List jobLogDTOs = BeanCopyUtil.copyList(jobLogPage.getRecords(), JobLogDTO.class); return new PageResult<>(jobLogDTOs, (int)jobLogPage.getTotal()); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java index 45fc625..7d418a8 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java @@ -5,10 +5,10 @@ import com.aurora.model.dto.JobDTO; import com.aurora.entity.Job; import com.aurora.mapper.JobMapper; import com.aurora.service.JobService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.CronUtils; -import com.aurora.utils.PageUtils; -import com.aurora.utils.ScheduleUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.CronUtil; +import com.aurora.util.PageUtil; +import com.aurora.util.ScheduleUtil; import com.aurora.model.vo.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -42,7 +42,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe scheduler.clear(); List jobs = jobMapper.selectList(null); for (Job job : jobs) { - ScheduleUtils.createScheduleJob(scheduler, job); + ScheduleUtil.createScheduleJob(scheduler, job); } } @@ -50,9 +50,9 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @Transactional(rollbackFor = Exception.class) public void saveJob(JobVO jobVO) { checkCronIsValid(jobVO); - Job job = BeanCopyUtils.copyObject(jobVO, Job.class); + Job job = BeanCopyUtil.copyObject(jobVO, Job.class); int row = jobMapper.insert(job); - if (row > 0) ScheduleUtils.createScheduleJob(scheduler, job); + if (row > 0) ScheduleUtil.createScheduleJob(scheduler, job); } @Override @@ -60,7 +60,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe public void updateJob(JobVO jobVO) { checkCronIsValid(jobVO); Job temp = jobMapper.selectById(jobVO.getId()); - Job job = BeanCopyUtils.copyObject(jobVO, Job.class); + Job job = BeanCopyUtil.copyObject(jobVO, Job.class); int row = jobMapper.updateById(job); if (row > 0) updateSchedulerJob(job, temp.getJobGroup()); } @@ -74,7 +74,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe if (row > 0) { jobs.forEach(item -> { try { - scheduler.deleteJob(ScheduleUtils.getJobKey(item.getId(), item.getJobGroup())); + scheduler.deleteJob(ScheduleUtil.getJobKey(item.getId(), item.getJobGroup())); } catch (SchedulerException e) { throw new RuntimeException(e); } @@ -85,8 +85,8 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @Override public JobDTO getJobById(Integer jobId) { Job job = jobMapper.selectById(jobId); - JobDTO jobDTO = BeanCopyUtils.copyObject(job, JobDTO.class); - Date nextExecution = CronUtils.getNextExecution(jobDTO.getCronExpression()); + JobDTO jobDTO = BeanCopyUtil.copyObject(job, JobDTO.class); + Date nextExecution = CronUtil.getNextExecution(jobDTO.getCronExpression()); jobDTO.setNextValidTime(nextExecution); return jobDTO; } @@ -95,7 +95,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @Override public PageResult listJobs(JobSearchVO jobSearchVO) { CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> jobMapper.countJobs(jobSearchVO)); - List jobDTOs = jobMapper.listJobs(PageUtils.getLimitCurrent(), PageUtils.getSize(), jobSearchVO); + List jobDTOs = jobMapper.listJobs(PageUtil.getLimitCurrent(), PageUtil.getSize(), jobSearchVO); return new PageResult<>(jobDTOs, asyncCount.get()); } @@ -115,9 +115,9 @@ public class JobServiceImpl extends ServiceImpl implements JobSe int row = jobMapper.update(null, updateWrapper); if (row > 0) { if (ScheduleConstant.Status.NORMAL.getValue().equals(status)) { - scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + scheduler.resumeJob(ScheduleUtil.getJobKey(jobId, jobGroup)); } else if (ScheduleConstant.Status.PAUSE.getValue().equals(status)) { - scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + scheduler.pauseJob(ScheduleUtil.getJobKey(jobId, jobGroup)); } } } @@ -127,7 +127,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe public void runJob(JobRunVO jobRunVO) { Integer jobId = jobRunVO.getId(); String jobGroup = jobRunVO.getJobGroup(); - scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + scheduler.triggerJob(ScheduleUtil.getJobKey(jobId, jobGroup)); } @Override @@ -139,7 +139,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe * 校验cron表达式的合法性 */ private void checkCronIsValid(JobVO jobVO) { - boolean valid = CronUtils.isValid(jobVO.getCronExpression()); + boolean valid = CronUtil.isValid(jobVO.getCronExpression()); Assert.isTrue(valid, "Cron表达式无效!"); } @@ -150,11 +150,11 @@ public class JobServiceImpl extends ServiceImpl implements JobSe public void updateSchedulerJob(Job job, String jobGroup) { Integer jobId = job.getId(); // 判断是否存在 - JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); + JobKey jobKey = ScheduleUtil.getJobKey(jobId, jobGroup); if (scheduler.checkExists(jobKey)) { // 防止创建时存在数据问题 先移除，然后在执行创建操作 scheduler.deleteJob(jobKey); } - ScheduleUtils.createScheduleJob(scheduler, job); + ScheduleUtil.createScheduleJob(scheduler, job); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java index 5d7b263..aaab765 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/MenuServiceImpl.java @@ -9,8 +9,8 @@ import com.aurora.exception.BizException; import com.aurora.mapper.MenuMapper; import com.aurora.mapper.RoleMenuMapper; import com.aurora.service.MenuService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.IsHiddenVO; import com.aurora.model.vo.MenuVO; @@ -48,9 +48,9 @@ public class MenuServiceImpl extends ServiceImpl implements Me Map> childrenMap = getMenuMap(menus); // 组装目录菜单数据 List menuDTOs = catalogs.stream().map(item -> { - MenuDTO menuDTO = BeanCopyUtils.copyObject(item, MenuDTO.class); + MenuDTO menuDTO = BeanCopyUtil.copyObject(item, MenuDTO.class); // 获取目录下的菜单排序 - List list = BeanCopyUtils.copyList(childrenMap.get(item.getId()), MenuDTO.class).stream() + List list = BeanCopyUtil.copyList(childrenMap.get(item.getId()), MenuDTO.class).stream() .sorted(Comparator.comparing(MenuDTO::getOrderNum)) .collect(Collectors.toList()); menuDTO.setChildren(list); @@ -62,7 +62,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me List childrenList = new ArrayList<>(); childrenMap.values().forEach(childrenList::addAll); List childrenDTOList = childrenList.stream() - .map(item -> BeanCopyUtils.copyObject(item, MenuDTO.class)) + .map(item -> BeanCopyUtil.copyObject(item, MenuDTO.class)) .sorted(Comparator.comparing(MenuDTO::getOrderNum)) .collect(Collectors.toList()); menuDTOs.addAll(childrenDTOList); @@ -73,13 +73,13 @@ public class MenuServiceImpl extends ServiceImpl implements Me @Transactional(rollbackFor = Exception.class) @Override public void saveOrUpdateMenu(MenuVO menuVO) { - Menu menu = BeanCopyUtils.copyObject(menuVO, Menu.class); + Menu menu = BeanCopyUtil.copyObject(menuVO, Menu.class); this.saveOrUpdate(menu); } @Override public void updateMenuIsHidden(IsHiddenVO isHiddenVO) { - Menu menu = BeanCopyUtils.copyObject(isHiddenVO, Menu.class); + Menu menu = BeanCopyUtil.copyObject(isHiddenVO, Menu.class); menuMapper.updateById(menu); } @@ -136,7 +136,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me @Override public List listUserMenus() { // 查询用户菜单信息 - List menus = menuMapper.listMenusByUserInfoId(UserUtils.getUserDetailsDTO().getUserInfoId()); + List menus = menuMapper.listMenusByUserInfoId(UserUtil.getUserDetailsDTO().getUserInfoId()); // 获取目录列表 List catalogs = listCatalogs(menus); // 获取目录下的子菜单 @@ -167,11 +167,11 @@ public class MenuServiceImpl extends ServiceImpl implements Me List children = childrenMap.get(item.getId()); if (CollectionUtils.isNotEmpty(children)) { // 多级菜单处理 - userMenuDTO = BeanCopyUtils.copyObject(item, UserMenuDTO.class); + userMenuDTO = BeanCopyUtil.copyObject(item, UserMenuDTO.class); list = children.stream() .sorted(Comparator.comparing(Menu::getOrderNum)) .map(menu -> { - UserMenuDTO dto = BeanCopyUtils.copyObject(menu, UserMenuDTO.class); + UserMenuDTO dto = BeanCopyUtil.copyObject(menu, UserMenuDTO.class); dto.setHidden(menu.getIsHidden().equals(TRUE)); return dto; }) diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/OperationLogServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/OperationLogServiceImpl.java index 57a2d2e..44966ab 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/OperationLogServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/OperationLogServiceImpl.java @@ -4,8 +4,8 @@ import com.aurora.model.dto.OperationLogDTO; import com.aurora.entity.OperationLog; import com.aurora.mapper.OperationLogMapper; import com.aurora.service.OperationLogService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -21,13 +21,13 @@ public class OperationLogServiceImpl extends ServiceImpl listOperationLogs(ConditionVO conditionVO) { - Page page = new Page<>(PageUtils.getCurrent(), PageUtils.getSize()); + Page page = new Page<>(PageUtil.getCurrent(), PageUtil.getSize()); Page operationLogPage = this.page(page, new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), OperationLog::getOptModule, conditionVO.getKeywords()) .or() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), OperationLog::getOptDesc, conditionVO.getKeywords()) .orderByDesc(OperationLog::getId)); - List operationLogDTOs = BeanCopyUtils.copyList(operationLogPage.getRecords(), OperationLogDTO.class); + List operationLogDTOs = BeanCopyUtil.copyList(operationLogPage.getRecords(), OperationLogDTO.class); return new PageResult<>(operationLogDTOs, (int) operationLogPage.getTotal()); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java index 52fa959..032a3bc 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java @@ -8,8 +8,8 @@ import com.aurora.exception.BizException; import com.aurora.mapper.PhotoAlbumMapper; import com.aurora.mapper.PhotoMapper; import com.aurora.service.PhotoAlbumService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; import com.aurora.model.vo.PhotoAlbumVO; @@ -47,7 +47,7 @@ public class PhotoAlbumServiceImpl extends ServiceImpl(); } // 查询相册信息 - List photoAlbumBackList = photoAlbumMapper.listPhotoAlbumsAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List photoAlbumBackList = photoAlbumMapper.listPhotoAlbumsAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(photoAlbumBackList, count); } @@ -69,7 +69,7 @@ public class PhotoAlbumServiceImpl extends ServiceImpl listPhotoAlbumInfosAdmin() { List photoAlbumList = photoAlbumMapper.selectList(new LambdaQueryWrapper() .eq(PhotoAlbum::getIsDelete, FALSE)); - return BeanCopyUtils.copyList(photoAlbumList, PhotoAlbumDTO.class); + return BeanCopyUtil.copyList(photoAlbumList, PhotoAlbumDTO.class); } @Override @@ -80,7 +80,7 @@ public class PhotoAlbumServiceImpl extends ServiceImpl() .eq(Photo::getAlbumId, albumId) .eq(Photo::getIsDelete, FALSE)); - PhotoAlbumAdminDTO album = BeanCopyUtils.copyObject(photoAlbum, PhotoAlbumAdminDTO.class); + PhotoAlbumAdminDTO album = BeanCopyUtil.copyObject(photoAlbum, PhotoAlbumAdminDTO.class); album.setPhotoCount(photoCount); return album; } @@ -112,7 +112,7 @@ public class PhotoAlbumServiceImpl extends ServiceImpl implements @Override public PageResult listPhotos(ConditionVO conditionVO) { // 查询照片列表 - Page page = new Page<>(PageUtils.getCurrent(), PageUtils.getSize()); + Page page = new Page<>(PageUtil.getCurrent(), PageUtil.getSize()); Page photoPage = photoMapper.selectPage(page, new LambdaQueryWrapper() .eq(Objects.nonNull(conditionVO.getAlbumId()), Photo::getAlbumId, conditionVO.getAlbumId()) .eq(Photo::getIsDelete, conditionVO.getIsDelete()) .orderByDesc(Photo::getId) .orderByDesc(Photo::getUpdateTime)); - List photos = BeanCopyUtils.copyList(photoPage.getRecords(), PhotoAdminDTO.class); + List photos = BeanCopyUtil.copyList(photoPage.getRecords(), PhotoAdminDTO.class); return new PageResult<>(photos, (int) photoPage.getTotal()); } @Transactional(rollbackFor = Exception.class) @Override public void updatePhoto(PhotoInfoVO photoInfoVO) { - Photo photo = BeanCopyUtils.copyObject(photoInfoVO, Photo.class); + Photo photo = BeanCopyUtil.copyObject(photoInfoVO, Photo.class); photoMapper.updateById(photo); } @@ -122,7 +122,7 @@ public class PhotoServiceImpl extends ServiceImpl implements return new PageResult<>(); } // 查询相册信息 - List PhotoAlbumAdminDTOs = photoAlbumMapper.listPhotoAlbumsAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List PhotoAlbumAdminDTOs = photoAlbumMapper.listPhotoAlbumsAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(PhotoAlbumAdminDTOs, count); } @@ -144,7 +144,7 @@ public class PhotoServiceImpl extends ServiceImpl implements throw new BizException("相册不存在"); } // 查询照片列表 - Page page = new Page<>(PageUtils.getCurrent(), PageUtils.getSize()); + Page page = new Page<>(PageUtil.getCurrent(), PageUtil.getSize()); List photos = photoMapper.selectPage(page, new LambdaQueryWrapper() .select(Photo::getPhotoSrc) .eq(Photo::getAlbumId, albumId) diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java index 43a9a11..8462f1a 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java @@ -9,7 +9,7 @@ import com.aurora.handler.FilterInvocationSecurityMetadataSourceImpl; import com.aurora.mapper.ResourceMapper; import com.aurora.mapper.RoleResourceMapper; import com.aurora.service.ResourceService; -import com.aurora.utils.BeanCopyUtils; +import com.aurora.util.BeanCopyUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.ResourceVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -91,7 +91,7 @@ public class ResourceServiceImpl extends ServiceImpl i @Override public void saveOrUpdateResource(ResourceVO resourceVO) { // 更新资源信息 - Resource resource = BeanCopyUtils.copyObject(resourceVO, Resource.class); + Resource resource = BeanCopyUtil.copyObject(resourceVO, Resource.class); this.saveOrUpdate(resource); // 重新加载角色资源信息 filterInvocationSecurityMetadataSource.clearDataSource(); @@ -127,8 +127,8 @@ public class ResourceServiceImpl extends ServiceImpl i Map> childrenMap = listResourceChildren(resourceList); // 绑定模块下的所有接口 List resourceDTOList = parentList.stream().map(item -> { - ResourceDTO resourceDTO = BeanCopyUtils.copyObject(item, ResourceDTO.class); - List childrenList = BeanCopyUtils.copyList(childrenMap.get(item.getId()), ResourceDTO.class); + ResourceDTO resourceDTO = BeanCopyUtil.copyObject(item, ResourceDTO.class); + List childrenList = BeanCopyUtil.copyList(childrenMap.get(item.getId()), ResourceDTO.class); resourceDTO.setChildren(childrenList); childrenMap.remove(item.getId()); return resourceDTO; @@ -138,7 +138,7 @@ public class ResourceServiceImpl extends ServiceImpl i List childrenList = new ArrayList<>(); childrenMap.values().forEach(childrenList::addAll); List childrenDTOList = childrenList.stream() - .map(item -> BeanCopyUtils.copyObject(item, ResourceDTO.class)) + .map(item -> BeanCopyUtil.copyObject(item, ResourceDTO.class)) .collect(Collectors.toList()); resourceDTOList.addAll(childrenDTOList); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java index 003e7bf..f1ba307 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/RoleServiceImpl.java @@ -14,8 +14,8 @@ import com.aurora.mapper.UserRoleMapper; import com.aurora.service.RoleMenuService; import com.aurora.service.RoleResourceService; import com.aurora.service.RoleService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; import com.aurora.model.vo.RoleVO; @@ -55,7 +55,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro // 查询角色列表 List roleList = roleMapper.selectList(new LambdaQueryWrapper() .select(Role::getId, Role::getRoleName)); - return BeanCopyUtils.copyList(roleList, UserRoleDTO.class); + return BeanCopyUtil.copyList(roleList, UserRoleDTO.class); } @SneakyThrows @@ -64,7 +64,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), Role::getRoleName, conditionVO.getKeywords()); CompletableFuture asyncCount = CompletableFuture.supplyAsync(() -> roleMapper.selectCount(queryWrapper)); - List roleDTOs = roleMapper.listRoles(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List roleDTOs = roleMapper.listRoles(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(roleDTOs, asyncCount.get()); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java index 8ef138b..f9a02ad 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java @@ -9,8 +9,8 @@ import com.aurora.exception.BizException; import com.aurora.mapper.ArticleTagMapper; import com.aurora.mapper.TagMapper; import com.aurora.service.TagService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.PageUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.PageUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; import com.aurora.model.vo.TagVO; @@ -53,7 +53,7 @@ public class TagServiceImpl extends ServiceImpl implements TagSe return new PageResult<>(); } // 分页查询标签列表 - List tags = tagMapper.listTagsAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List tags = tagMapper.listTagsAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(tags, count); } @@ -63,7 +63,7 @@ public class TagServiceImpl extends ServiceImpl implements TagSe List tagList = tagMapper.selectList(new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), Tag::getTagName, conditionVO.getKeywords()) .orderByDesc(Tag::getId)); - return BeanCopyUtils.copyList(tagList, TagAdminDTO.class); + return BeanCopyUtil.copyList(tagList, TagAdminDTO.class); } @Override @@ -74,7 +74,7 @@ public class TagServiceImpl extends ServiceImpl implements TagSe if (Objects.nonNull(existTag) && !existTag.getId().equals(tagVO.getId())) { throw new BizException("标签名已存在"); } - Tag tag = BeanCopyUtils.copyObject(tagVO, Tag.class); + Tag tag = BeanCopyUtil.copyObject(tagVO, Tag.class); this.saveOrUpdate(tag); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java index ecc42ad..65b3102 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java @@ -10,10 +10,10 @@ import com.aurora.mapper.CommentMapper; import com.aurora.mapper.TalkMapper; import com.aurora.service.TalkService; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.CommonUtils; -import com.aurora.utils.PageUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.CommonUtil; +import com.aurora.util.PageUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.ConditionVO; import com.aurora.model.vo.PageResult; import com.aurora.model.vo.TalkVO; @@ -49,7 +49,7 @@ public class TalkServiceImpl extends ServiceImpl implements Ta return new PageResult<>(); } // 分页查询说说 - List talkDTOs = talkMapper.listTalks(PageUtils.getLimitCurrent(), PageUtils.getSize()); + List talkDTOs = talkMapper.listTalks(PageUtil.getLimitCurrent(), PageUtil.getSize()); // 查询说说评论量 List talkIds = talkDTOs.stream() .map(TalkDTO::getId) @@ -62,7 +62,7 @@ public class TalkServiceImpl extends ServiceImpl implements Ta item.setCommentCount(commentCountMap.get(item.getId())); // 转换图片格式 if (Objects.nonNull(item.getImages())) { - item.setImgs(CommonUtils.castList(JSON.parseObject(item.getImages(), List.class), String.class)); + item.setImgs(CommonUtil.castList(JSON.parseObject(item.getImages(), List.class), String.class)); } }); return new PageResult<>(talkDTOs, count); @@ -77,15 +77,15 @@ public class TalkServiceImpl extends ServiceImpl implements Ta } // 转换图片格式 if (Objects.nonNull(talkDTO.getImages())) { - talkDTO.setImgs(CommonUtils.castList(JSON.parseObject(talkDTO.getImages(), List.class), String.class)); + talkDTO.setImgs(CommonUtil.castList(JSON.parseObject(talkDTO.getImages(), List.class), String.class)); } return talkDTO; } @Override public void saveOrUpdateTalk(TalkVO talkVO) { - Talk talk = BeanCopyUtils.copyObject(talkVO, Talk.class); - talk.setUserId(UserUtils.getUserDetailsDTO().getUserInfoId()); + Talk talk = BeanCopyUtil.copyObject(talkVO, Talk.class); + talk.setUserId(UserUtil.getUserDetailsDTO().getUserInfoId()); this.saveOrUpdate(talk); } @@ -103,11 +103,11 @@ public class TalkServiceImpl extends ServiceImpl implements Ta return new PageResult<>(); } // 分页查询说说 - List talkDTOList = talkMapper.listTalksAdmin(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List talkDTOList = talkMapper.listTalksAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); talkDTOList.forEach(item -> { // 转换图片格式 if (Objects.nonNull(item.getImages())) { - item.setImgs(CommonUtils.castList(JSON.parseObject(item.getImages(), List.class), String.class)); + item.setImgs(CommonUtil.castList(JSON.parseObject(item.getImages(), List.class), String.class)); } }); return new PageResult<>(talkDTOList, count); @@ -118,7 +118,7 @@ public class TalkServiceImpl extends ServiceImpl implements Ta TalkAdminDTO talkBackDTO = talkMapper.getTalkByIdAdmin(talkId); // 转换图片格式 if (Objects.nonNull(talkBackDTO.getImages())) { - talkBackDTO.setImgs(CommonUtils.castList(JSON.parseObject(talkBackDTO.getImages(), List.class), String.class)); + talkBackDTO.setImgs(CommonUtil.castList(JSON.parseObject(talkBackDTO.getImages(), List.class), String.class)); } return talkBackDTO; } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java index 934fc2f..770da2f 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/TokenServiceImpl.java @@ -70,7 +70,7 @@ public class TokenServiceImpl implements TokenService { @Override public UserDetailsDTO getUserDetailDTO(HttpServletRequest request) { - String token = request.getHeader(TOKEN_HEADER).replaceFirst(TOKEN_PREFIX, ""); + String token = Optional.ofNullable(request.getHeader(TOKEN_HEADER)).orElse("").replaceFirst(TOKEN_PREFIX, ""); if (StringUtils.hasText(token) && !token.equals("null")) { Claims claims = parseToken(token); String userId = claims.getSubject(); diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java index c160a4d..ba0d498 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/UserAuthServiceImpl.java @@ -17,8 +17,8 @@ import com.aurora.service.RedisService; import com.aurora.service.TokenService; import com.aurora.service.UserAuthService; import com.aurora.strategy.context.SocialLoginStrategyContext; -import com.aurora.utils.PageUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.PageUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -41,8 +41,8 @@ import java.util.stream.Collectors; import static com.aurora.constant.MQPrefixConstant.EMAIL_EXCHANGE; import static com.aurora.constant.RedisPrefixConstant.*; import static com.aurora.enums.UserAreaTypeEnum.getUserAreaType; -import static com.aurora.utils.CommonUtils.checkEmail; -import static com.aurora.utils.CommonUtils.getRandomCode; +import static com.aurora.util.CommonUtil.checkEmail; +import static com.aurora.util.CommonUtil.getRandomCode; @Service @@ -168,11 +168,11 @@ public class UserAuthServiceImpl implements UserAuthService { public void updateAdminPassword(PasswordVO passwordVO) { // 查询旧密码是否正确 UserAuth user = userAuthMapper.selectOne(new LambdaQueryWrapper() - .eq(UserAuth::getId, UserUtils.getUserDetailsDTO().getId())); + .eq(UserAuth::getId, UserUtil.getUserDetailsDTO().getId())); // 正确则修改密码，错误则提示不正确 if (Objects.nonNull(user) && BCrypt.checkpw(passwordVO.getOldPassword(), user.getPassword())) { UserAuth userAuth = UserAuth.builder() - .id(UserUtils.getUserDetailsDTO().getId()) + .id(UserUtil.getUserDetailsDTO().getId()) .password(BCrypt.hashpw(passwordVO.getNewPassword(), BCrypt.gensalt())) .build(); userAuthMapper.updateById(userAuth); @@ -189,14 +189,14 @@ public class UserAuthServiceImpl implements UserAuthService { return new PageResult<>(); } // 获取后台用户列表 - List UserAdminDTOs = userAuthMapper.listUsers(PageUtils.getLimitCurrent(), PageUtils.getSize(), conditionVO); + List UserAdminDTOs = userAuthMapper.listUsers(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); return new PageResult<>(UserAdminDTOs, count); } @SneakyThrows @Override public UserLogoutStatusDTO logout() { - tokenService.delLoginUser(UserUtils.getUserDetailsDTO().getId()); + tokenService.delLoginUser(UserUtil.getUserDetailsDTO().getId()); return new UserLogoutStatusDTO("注销成功"); } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/UserDetailServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/UserDetailServiceImpl.java index eb3c345..55d385c 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/UserDetailServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/UserDetailServiceImpl.java @@ -8,7 +8,7 @@ import com.aurora.exception.BizException; import com.aurora.mapper.RoleMapper; import com.aurora.mapper.UserAuthMapper; import com.aurora.mapper.UserInfoMapper; -import com.aurora.utils.IpUtils; +import com.aurora.util.IpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import eu.bitwalker.useragentutils.UserAgent; @@ -61,9 +61,9 @@ public class UserDetailServiceImpl implements UserDetailsService { // 查询账号角色 List roles = roleMapper.listRolesByUserInfoId(userInfo.getId()); // 获取设备信息 - String ipAddress = IpUtils.getIpAddress(request); - String ipSource = IpUtils.getIpSource(ipAddress); - UserAgent userAgent = IpUtils.getUserAgent(request); + String ipAddress = IpUtil.getIpAddress(request); + String ipSource = IpUtil.getIpSource(ipAddress); + UserAgent userAgent = IpUtil.getUserAgent(request); // 封装权限集合 return UserDetailsDTO.builder() .id(user.getId()) diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java index 11474ab..52de4a0 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/UserInfoServiceImpl.java @@ -15,8 +15,8 @@ import com.aurora.service.TokenService; import com.aurora.service.UserInfoService; import com.aurora.service.UserRoleService; import com.aurora.strategy.context.UploadStrategyContext; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.UserUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.UserUtil; import com.aurora.model.vo.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -30,8 +30,8 @@ import java.util.*; import java.util.stream.Collectors; import static com.aurora.constant.RedisPrefixConstant.USER_CODE_KEY; -import static com.aurora.utils.PageUtils.getLimitCurrent; -import static com.aurora.utils.PageUtils.getSize; +import static com.aurora.util.PageUtil.getLimitCurrent; +import static com.aurora.util.PageUtil.getSize; @Service @@ -61,7 +61,7 @@ public class UserInfoServiceImpl extends ServiceImpl i public void updateUserInfo(UserInfoVO userInfoVO) { // 封装用户信息 UserInfo userInfo = UserInfo.builder() - .id(UserUtils.getUserDetailsDTO().getUserInfoId()) + .id(UserUtil.getUserDetailsDTO().getUserInfoId()) .nickname(userInfoVO.getNickname()) .intro(userInfoVO.getIntro()) .website(userInfoVO.getWebsite()) @@ -75,7 +75,7 @@ public class UserInfoServiceImpl extends ServiceImpl i String avatar = uploadStrategyContext.executeUploadStrategy(file, FilePathEnum.AVATAR.getPath()); // 更新用户信息 UserInfo userInfo = UserInfo.builder() - .id(UserUtils.getUserDetailsDTO().getUserInfoId()) + .id(UserUtil.getUserDetailsDTO().getUserInfoId()) .avatar(avatar) .build(); userInfoMapper.updateById(userInfo); @@ -92,7 +92,7 @@ public class UserInfoServiceImpl extends ServiceImpl i throw new BizException("验证码错误！"); } UserInfo userInfo = UserInfo.builder() - .id(UserUtils.getUserDetailsDTO().getUserInfoId()) + .id(UserUtil.getUserDetailsDTO().getUserInfoId()) .email(emailVO.getEmail()) .build(); userInfoMapper.updateById(userInfo); @@ -152,7 +152,7 @@ public class UserInfoServiceImpl extends ServiceImpl i for (Object value : values) { userDetailsDTOs.add((UserDetailsDTO) value); } - List userOnlineDTOs = BeanCopyUtils.copyList(userDetailsDTOs, UserOnlineDTO.class); + List userOnlineDTOs = BeanCopyUtil.copyList(userDetailsDTOs, UserOnlineDTO.class); List onlineUsers = userOnlineDTOs.stream() .filter(item -> StringUtils.isBlank(conditionVO.getKeywords()) || item.getNickname().contains(conditionVO.getKeywords())) .sorted(Comparator.comparing(UserOnlineDTO::getLastLoginTime).reversed()) @@ -173,6 +173,6 @@ public class UserInfoServiceImpl extends ServiceImpl i @Override public UserInfoDTO getUserInfoById(Integer id) { UserInfo userInfo = userInfoMapper.selectById(id); - return BeanCopyUtils.copyObject(userInfo, UserInfoDTO.class); + return BeanCopyUtil.copyObject(userInfo, UserInfoDTO.class); } } diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java index 671d1d5..ea52f54 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractSocialLoginStrategyImpl.java @@ -15,8 +15,8 @@ import com.aurora.mapper.UserRoleMapper; import com.aurora.service.TokenService; import com.aurora.service.impl.UserDetailServiceImpl; import com.aurora.strategy.SocialLoginStrategy; -import com.aurora.utils.BeanCopyUtils; -import com.aurora.utils.IpUtils; +import com.aurora.util.BeanCopyUtil; +import com.aurora.util.IpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.springframework.beans.factory.annotation.Autowired; @@ -64,8 +64,8 @@ public abstract class AbstractSocialLoginStrategyImpl implements SocialLoginStra // 获取第三方token信息 SocialTokenDTO socialToken = getSocialToken(data); // 获取用户ip信息 - String ipAddress = IpUtils.getIpAddress(request); - String ipSource = IpUtils.getIpSource(ipAddress); + String ipAddress = IpUtil.getIpAddress(request); + String ipSource = IpUtil.getIpSource(ipAddress); // 判断是否已注册 UserAuth user = getUserAuth(socialToken); if (Objects.nonNull(user)) { @@ -84,7 +84,7 @@ public abstract class AbstractSocialLoginStrategyImpl implements SocialLoginStra UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(userDetailsDTO, null, userDetailsDTO.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(auth); // 返回用户信息 - UserInfoDTO userInfoDTO = BeanCopyUtils.copyObject(userDetailsDTO, UserInfoDTO.class); + UserInfoDTO userInfoDTO = BeanCopyUtil.copyObject(userDetailsDTO, UserInfoDTO.class); String token = tokenService.createToken(userDetailsDTO); userInfoDTO.setToken(token); return userInfoDTO; diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractUploadStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractUploadStrategyImpl.java index 6f97886..2d4bc8b 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractUploadStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/AbstractUploadStrategyImpl.java @@ -2,7 +2,7 @@ package com.aurora.strategy.impl; import com.aurora.exception.BizException; import com.aurora.strategy.UploadStrategy; -import com.aurora.utils.FileUtils; +import com.aurora.util.FileUtil; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -19,9 +19,9 @@ public abstract class AbstractUploadStrategyImpl implements UploadStrategy { public String uploadFile(MultipartFile file, String path) { try { // 获取文件md5值 - String md5 = FileUtils.getMd5(file.getInputStream()); + String md5 = FileUtil.getMd5(file.getInputStream()); // 获取文件扩展名 - String extName = FileUtils.getExtName(file.getOriginalFilename()); + String extName = FileUtil.getExtName(file.getOriginalFilename()); // 重新生成文件名 String fileName = md5 + extName; // 判断文件是否已存在 diff --git a/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java b/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java index 7c1f54a..0e4520e 100644 --- a/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/strategy/impl/QQLoginStrategyImpl.java @@ -9,7 +9,7 @@ import com.aurora.model.dto.SocialTokenDTO; import com.aurora.model.dto.SocialUserInfoDTO; import com.aurora.enums.LoginTypeEnum; import com.aurora.exception.BizException; -import com.aurora.utils.CommonUtils; +import com.aurora.util.CommonUtil; import com.aurora.model.vo.QQLoginVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -76,7 +76,7 @@ public class QQLoginStrategyImpl extends AbstractSocialLoginStrategyImpl { qqData.put(SocialLoginConstant.ACCESS_TOKEN, qqLoginVO.getAccessToken()); try { String result = restTemplate.getForObject(qqConfigProperties.getCheckTokenUrl(), String.class, qqData); - QQTokenDTO qqTokenDTO = JSON.parseObject(CommonUtils.getBracketsContent(Objects.requireNonNull(result)), QQTokenDTO.class); + QQTokenDTO qqTokenDTO = JSON.parseObject(CommonUtil.getBracketsContent(Objects.requireNonNull(result)), QQTokenDTO.class); // 判断openId是否一致 if (!qqLoginVO.getOpenId().equals(qqTokenDTO.getOpenid())) { throw new BizException(QQ_LOGIN_ERROR); diff --git a/aurora-springboot/src/main/java/com/aurora/utils/BeanCopyUtils.java b/aurora-springboot/src/main/java/com/aurora/util/BeanCopyUtil.java similarity index 88% rename from aurora-springboot/src/main/java/com/aurora/utils/BeanCopyUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/BeanCopyUtil.java index 98bf781..b1fae78 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/BeanCopyUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/BeanCopyUtil.java @@ -1,5 +1,4 @@ -package com.aurora.utils; - +package com.aurora.util; import java.util.ArrayList; @@ -9,10 +8,11 @@ import java.util.List; * @author 花未眠 * 复制对象和集合属性 */ -public class BeanCopyUtils { +public class BeanCopyUtil { /** * 复制对象 + * * @param source 源 * @param target 目标 * @return {@link T} @@ -32,6 +32,7 @@ public class BeanCopyUtils { /** * 拷贝集合 + * * @param source 源 * @param target 目标 * @return {@link List} 集合 @@ -40,7 +41,7 @@ public class BeanCopyUtils { List list = new ArrayList<>(); if (null != source && source.size() > 0) { for (Object obj : source) { - list.add(BeanCopyUtils.copyObject(obj, target)); + list.add(BeanCopyUtil.copyObject(obj, target)); } } return list; diff --git a/aurora-springboot/src/main/java/com/aurora/utils/CommonUtils.java b/aurora-springboot/src/main/java/com/aurora/util/CommonUtil.java similarity index 96% rename from aurora-springboot/src/main/java/com/aurora/utils/CommonUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/CommonUtil.java index ee870b5..67ccc40 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/CommonUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import java.util.*; import java.util.regex.Matcher; @@ -8,10 +8,11 @@ import java.util.regex.Pattern; * @author 花未眠 * 公共工具类 */ -public class CommonUtils { +public class CommonUtil { /** * 检测邮箱是否合法 + * * @param username 用户名 * @return 合法状态 */ @@ -27,6 +28,7 @@ public class CommonUtils { /** * 获取括号内容 + * * @param str str * @return {@link String} 括号内容 */ @@ -36,6 +38,7 @@ public class CommonUtils { /** * 生成6位随机验证码 + * * @return 验证码 */ public static String getRandomCode() { @@ -49,6 +52,7 @@ public class CommonUtils { /** * 转换List + * * @param obj obj * @param clazz clazz * @return {@link List} @@ -66,6 +70,7 @@ public class CommonUtils { /** * 转换set + * * @param obj obj * @param clazz clazz * @return {@link Set} diff --git a/aurora-springboot/src/main/java/com/aurora/utils/CronUtils.java b/aurora-springboot/src/main/java/com/aurora/util/CronUtil.java similarity index 96% rename from aurora-springboot/src/main/java/com/aurora/utils/CronUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/CronUtil.java index e428da5..7241b9a 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/CronUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/CronUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import org.quartz.CronExpression; @@ -8,7 +8,7 @@ import java.util.Date; * @author 花未眠 * cron表达式工具类 */ -public class CronUtils { +public class CronUtil { /** * 返回一个布尔值代表一个给定的Cron表达式的有效性 * diff --git a/aurora-springboot/src/main/java/com/aurora/utils/EmailUtils.java b/aurora-springboot/src/main/java/com/aurora/util/EmailUtil.java similarity index 97% rename from aurora-springboot/src/main/java/com/aurora/utils/EmailUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/EmailUtil.java index 8114ec6..e61294e 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/EmailUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/EmailUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import com.aurora.model.dto.EmailDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +19,7 @@ import javax.mail.internet.MimeMessage; * @author ican */ @Component -public class EmailUtils { +public class EmailUtil { /** * 邮箱号 */ diff --git a/aurora-springboot/src/main/java/com/aurora/utils/ExceptionUtils.java b/aurora-springboot/src/main/java/com/aurora/util/ExceptionUtil.java similarity index 86% rename from aurora-springboot/src/main/java/com/aurora/utils/ExceptionUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/ExceptionUtil.java index 3de03be..50d7fd5 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/ExceptionUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/ExceptionUtil.java @@ -1,9 +1,9 @@ -package com.aurora.utils; +package com.aurora.util; import java.io.PrintWriter; import java.io.StringWriter; -public class ExceptionUtils { +public class ExceptionUtil { public static String getTrace(Throwable t) { StringWriter stringWriter = new StringWriter(); diff --git a/aurora-springboot/src/main/java/com/aurora/utils/FileUtils.java b/aurora-springboot/src/main/java/com/aurora/util/FileUtil.java similarity index 97% rename from aurora-springboot/src/main/java/com/aurora/utils/FileUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/FileUtil.java index 97f539c..5bb97a3 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/FileUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/FileUtil.java @@ -1,9 +1,10 @@ -package com.aurora.utils; +package com.aurora.util; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import lombok.extern.log4j.Log4j2; import org.apache.commons.codec.binary.Hex; import org.springframework.web.multipart.MultipartFile; + import java.io.*; import java.security.MessageDigest; import java.util.Objects; @@ -13,10 +14,11 @@ import java.util.Objects; * 文件md5工具类 */ @Log4j2 -public class FileUtils { +public class FileUtil { /** * 获取文件md5值 + * * @param inputStream 文件输入流 * @return {@link String} 文件md5值 */ @@ -45,6 +47,7 @@ public class FileUtils { /** * 得到文件扩展名 + * * @param fileName 文件名称 * @return {@link String} 文件后缀 */ @@ -57,6 +60,7 @@ public class FileUtils { /** * 转换file + * * @param multipartFile 多部分文件 * @return {@link File} file */ @@ -77,6 +81,7 @@ public class FileUtils { /** * 自动调节精度(经验数值) + * * @param size 源图片大小 * @return 图片压缩质量比 */ diff --git a/aurora-springboot/src/main/java/com/aurora/utils/HTMLUtils.java b/aurora-springboot/src/main/java/com/aurora/util/HTMLUtil.java similarity index 96% rename from aurora-springboot/src/main/java/com/aurora/utils/HTMLUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/HTMLUtil.java index 0356f11..f9b750c 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/HTMLUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/HTMLUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import com.github.houbb.sensitive.word.bs.SensitiveWordBs; @@ -6,7 +6,7 @@ import com.github.houbb.sensitive.word.bs.SensitiveWordBs; * @author 花未眠 * HTML工具类 */ -public class HTMLUtils { +public class HTMLUtil { private static final SensitiveWordBs sensitiveWordBs = SensitiveWordBs.newInstance() .ignoreCase(true) diff --git a/aurora-springboot/src/main/java/com/aurora/utils/IpUtils.java b/aurora-springboot/src/main/java/com/aurora/util/IpUtil.java similarity index 98% rename from aurora-springboot/src/main/java/com/aurora/utils/IpUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/IpUtil.java index c03c46e..46a2397 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/IpUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/IpUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import eu.bitwalker.useragentutils.UserAgent; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ import java.net.UnknownHostException; */ @Slf4j @Component -public class IpUtils { +public class IpUtil { /** * 获取ip地址 diff --git a/aurora-springboot/src/main/java/com/aurora/utils/JobInvokeUtils.java b/aurora-springboot/src/main/java/com/aurora/util/JobInvokeUtil.java similarity index 97% rename from aurora-springboot/src/main/java/com/aurora/utils/JobInvokeUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/JobInvokeUtil.java index 06393da..8fcdbdf 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/JobInvokeUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/JobInvokeUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import com.aurora.entity.Job; import org.apache.commons.lang3.StringUtils; @@ -12,7 +12,7 @@ import java.util.List; * @author 花未眠 * 任务执行工具 */ -public class JobInvokeUtils { +public class JobInvokeUtil { /** * 执行方法 * @@ -25,7 +25,7 @@ public class JobInvokeUtils { List methodParams = getMethodParams(invokeTarget); if (!isValidClassName(beanName)) { - Object bean = SpringUtils.getBean(beanName); + Object bean = SpringUtil.getBean(beanName); invokeMethod(bean, methodName, methodParams); } else { Object bean = Class.forName(beanName).newInstance(); diff --git a/aurora-springboot/src/main/java/com/aurora/utils/PageUtils.java b/aurora-springboot/src/main/java/com/aurora/util/PageUtil.java similarity index 94% rename from aurora-springboot/src/main/java/com/aurora/utils/PageUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/PageUtil.java index f088c20..667ae46 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/PageUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/PageUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,7 +8,7 @@ import java.util.Objects; * @author 花未眠 * 分页工具类 **/ -public class PageUtils { +public class PageUtil { private static final ThreadLocal> PAGE_HOLDER = new ThreadLocal<>(); diff --git a/aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java b/aurora-springboot/src/main/java/com/aurora/util/ScheduleUtil.java similarity index 96% rename from aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/ScheduleUtil.java index 3e0b0bb..5267a6f 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/ScheduleUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/ScheduleUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import com.aurora.constant.ScheduleConstant; import com.aurora.entity.Job; @@ -11,7 +11,7 @@ import org.quartz.*; * @author 花未眠 * 定时任务工具类 */ -public class ScheduleUtils { +public class ScheduleUtil { /** * 得到quartz任务类 * @@ -68,7 +68,7 @@ public class ScheduleUtils { // 暂停任务 if (job.getStatus().equals(ScheduleConstant.Status.PAUSE.getValue())) { - scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + scheduler.pauseJob(ScheduleUtil.getJobKey(jobId, jobGroup)); } } diff --git a/aurora-springboot/src/main/java/com/aurora/utils/SpringUtils.java b/aurora-springboot/src/main/java/com/aurora/util/SpringUtil.java similarity index 93% rename from aurora-springboot/src/main/java/com/aurora/utils/SpringUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/SpringUtil.java index 56e0fde..e3bdfa0 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/SpringUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/SpringUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; * spring工具类 */ @Component -public class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware { +public class SpringUtil implements BeanFactoryPostProcessor, ApplicationContextAware { /** * Spring应用上下文环境 */ @@ -24,12 +24,12 @@ public class SpringUtils implements BeanFactoryPostProcessor, ApplicationContext @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { - SpringUtils.beanFactory = beanFactory; + SpringUtil.beanFactory = beanFactory; } @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - SpringUtils.applicationContext = applicationContext; + SpringUtil.applicationContext = applicationContext; } /** diff --git a/aurora-springboot/src/main/java/com/aurora/utils/UserUtils.java b/aurora-springboot/src/main/java/com/aurora/util/UserUtil.java similarity index 91% rename from aurora-springboot/src/main/java/com/aurora/utils/UserUtils.java rename to aurora-springboot/src/main/java/com/aurora/util/UserUtil.java index 41ba1c8..b304857 100644 --- a/aurora-springboot/src/main/java/com/aurora/utils/UserUtils.java +++ b/aurora-springboot/src/main/java/com/aurora/util/UserUtil.java @@ -1,4 +1,4 @@ -package com.aurora.utils; +package com.aurora.util; import com.aurora.model.dto.UserDetailsDTO; import org.springframework.security.core.Authentication; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 用户工具类 */ @Component -public class UserUtils { +public class UserUtil { public static UserDetailsDTO getUserDetailsDTO() { return (UserDetailsDTO) SecurityContextHolder.getContext().getAuthentication().getPrincipal();