🎨 优化后端代码的目录结构

aurora-springboot/src/main/java/com/aurora/config/WebMvcConfig.java

@@ -1,9 +1,9 @@
 package com.aurora.config;
 
 
-import com.aurora.handler.PageableHandlerInterceptor;
-import com.aurora.handler.WebSecurityHandler;
-import org.springframework.context.annotation.Bean;
+import com.aurora.interceptor.PaginationInterceptor;
+import com.aurora.interceptor.AccessLimitInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -16,10 +16,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    @Bean
-    public WebSecurityHandler getWebSecurityHandler() {
-        return new WebSecurityHandler();
-    }
+    @Autowired
+    private PaginationInterceptor paginationInterceptor;
+
+    @Autowired
+    private AccessLimitInterceptor accessLimitInterceptor;
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
@@ -32,8 +33,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new PageableHandlerInterceptor());
-        registry.addInterceptor(getWebSecurityHandler());
+        registry.addInterceptor(paginationInterceptor);
+        registry.addInterceptor(accessLimitInterceptor);
     }
 
 }

aurora-springboot/src/main/java/com/aurora/config/properties/MinioProperties.java

@@ -1,4 +1,4 @@
-package com.aurora.config;
+package com.aurora.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -8,9 +8,24 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "upload.minio")
 public class MinioProperties {
+    /**
+     * minio域名
+     */
+    private String url;
+    /**
+     * 终点
+     */
     private String endpoint;
+    /**
+     * accessKey
+     */
     private String accessKey;
+    /**
+     * secretKey
+     */
     private String secretKey;
+    /**
+     * 桶名称
+     */
     private String bucketName;
-    private String url;
 }

aurora-springboot/src/main/java/com/aurora/config/properties/OssConfigProperties.java

@@ -1,4 +1,4 @@
-package com.aurora.config;
+package com.aurora.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

aurora-springboot/src/main/java/com/aurora/config/properties/QQConfigProperties.java

@@ -1,4 +1,4 @@
-package com.aurora.config;
+package com.aurora.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

aurora-springboot/src/main/java/com/aurora/consumer/CommentNoticeConsumer.java

@@ -1,7 +1,7 @@
 package com.aurora.consumer;
 
 import com.alibaba.fastjson.JSON;
-import com.aurora.dto.EmailDTO;
+import com.aurora.model.dto.EmailDTO;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/consumer/MaxWellConsumer.java

@@ -1,12 +1,11 @@
 package com.aurora.consumer;
 
 import com.alibaba.fastjson.JSON;
-import com.aurora.dto.ArticleSearchDTO;
-import com.aurora.dto.MaxwellDataDTO;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/consumer/SubscribeConsumer.java

@@ -2,7 +2,6 @@ package com.aurora.consumer;
 
 
 import com.alibaba.fastjson.JSON;
-import com.aurora.dto.EmailDTO;
 import com.aurora.entity.Article;
 import com.aurora.entity.UserInfo;
 import com.aurora.service.ArticleService;
@@ -18,7 +17,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static com.aurora.constant.CommonConst.TRUE;
 import static com.aurora.constant.MQPrefixConst.SUBSCRIBE_QUEUE;

aurora-springboot/src/main/java/com/aurora/controller/ArticleController.java

@@ -1,12 +1,12 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.*;
+import com.aurora.model.dto.*;
 import com.aurora.enums.FilePathEnum;
 import com.aurora.service.ArticleService;
 import com.aurora.strategy.context.ArticleImportStrategyContext;
 import com.aurora.strategy.context.UploadStrategyContext;
-import com.aurora.vo.*;
+import com.aurora.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

aurora-springboot/src/main/java/com/aurora/controller/AuroraInfoController.java

@@ -1,16 +1,16 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.AboutDTO;
-import com.aurora.dto.AuroraAdminInfoDTO;
-import com.aurora.dto.AuroraHomeInfoDTO;
-import com.aurora.dto.WebsiteConfigDTO;
+import com.aurora.model.dto.AboutDTO;
+import com.aurora.model.dto.AuroraAdminInfoDTO;
+import com.aurora.model.dto.AuroraHomeInfoDTO;
+import com.aurora.model.dto.WebsiteConfigDTO;
 import com.aurora.enums.FilePathEnum;
 import com.aurora.service.AuroraInfoService;
 import com.aurora.strategy.context.UploadStrategyContext;
-import com.aurora.vo.AboutVO;
-import com.aurora.vo.Result;
-import com.aurora.vo.WebsiteConfigVO;
+import com.aurora.model.vo.AboutVO;
+import com.aurora.model.vo.Result;
+import com.aurora.model.vo.WebsiteConfigVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

aurora-springboot/src/main/java/com/aurora/controller/CategoryController.java

@@ -1,14 +1,14 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.CategoryAdminDTO;
-import com.aurora.dto.CategoryDTO;
-import com.aurora.dto.CategoryOptionDTO;
+import com.aurora.model.dto.CategoryAdminDTO;
+import com.aurora.model.dto.CategoryDTO;
+import com.aurora.model.dto.CategoryOptionDTO;
 import com.aurora.service.CategoryService;
-import com.aurora.vo.CategoryVO;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.CategoryVO;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/CommentController.java

@@ -2,11 +2,11 @@ package com.aurora.controller;
 
 import com.aurora.annotation.AccessLimit;
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.CommentAdminDTO;
-import com.aurora.dto.CommentDTO;
-import com.aurora.dto.ReplyDTO;
+import com.aurora.model.dto.CommentAdminDTO;
+import com.aurora.model.dto.CommentDTO;
+import com.aurora.model.dto.ReplyDTO;
 import com.aurora.service.CommentService;
-import com.aurora.vo.*;
+import com.aurora.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/ExceptionLogController.java

@@ -1,10 +1,10 @@
 package com.aurora.controller;
 
-import com.aurora.dto.ExceptionLogDTO;
+import com.aurora.model.dto.ExceptionLogDTO;
 import com.aurora.service.ExceptionLogService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/FriendLinkController.java

@@ -1,13 +1,13 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.FriendLinkAdminDTO;
-import com.aurora.dto.FriendLinkDTO;
+import com.aurora.model.dto.FriendLinkAdminDTO;
+import com.aurora.model.dto.FriendLinkDTO;
 import com.aurora.service.FriendLinkService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.FriendLinkVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.FriendLinkVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/JobController.java

@@ -1,9 +1,9 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.JobDTO;
+import com.aurora.model.dto.JobDTO;
 import com.aurora.service.JobService;
-import com.aurora.vo.*;
+import com.aurora.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/JobLogController.java

@@ -1,11 +1,11 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.JobLogDTO;
+import com.aurora.model.dto.JobLogDTO;
 import com.aurora.service.JobLogService;
-import com.aurora.vo.JobLogSearchVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.JobLogSearchVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/MenuController.java

@@ -1,14 +1,14 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.LabelOptionDTO;
-import com.aurora.dto.MenuDTO;
-import com.aurora.dto.UserMenuDTO;
+import com.aurora.model.dto.LabelOptionDTO;
+import com.aurora.model.dto.MenuDTO;
+import com.aurora.model.dto.UserMenuDTO;
 import com.aurora.service.MenuService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.IsHiddenVO;
-import com.aurora.vo.MenuVO;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.IsHiddenVO;
+import com.aurora.model.vo.MenuVO;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/OperationLogController.java

@@ -1,10 +1,10 @@
 package com.aurora.controller;
 
-import com.aurora.dto.OperationLogDTO;
+import com.aurora.model.dto.OperationLogDTO;
 import com.aurora.service.OperationLogService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/PhotoAlbumController.java

@@ -1,15 +1,15 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.PhotoAlbumAdminDTO;
-import com.aurora.dto.PhotoAlbumDTO;
+import com.aurora.model.dto.PhotoAlbumAdminDTO;
+import com.aurora.model.dto.PhotoAlbumDTO;
 import com.aurora.enums.FilePathEnum;
 import com.aurora.service.PhotoAlbumService;
 import com.aurora.strategy.context.UploadStrategyContext;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.PhotoAlbumVO;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.PhotoAlbumVO;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

aurora-springboot/src/main/java/com/aurora/controller/PhotoController.java

@@ -1,10 +1,10 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.PhotoAdminDTO;
-import com.aurora.dto.PhotoDTO;
+import com.aurora.model.dto.PhotoAdminDTO;
+import com.aurora.model.dto.PhotoDTO;
 import com.aurora.service.PhotoService;
-import com.aurora.vo.*;
+import com.aurora.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/ResourceController.java

@@ -1,12 +1,12 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.LabelOptionDTO;
-import com.aurora.dto.ResourceDTO;
+import com.aurora.model.dto.LabelOptionDTO;
+import com.aurora.model.dto.ResourceDTO;
 import com.aurora.service.ResourceService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.ResourceVO;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.ResourceVO;
+import com.aurora.model.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/RoleController.java

@@ -1,13 +1,13 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.RoleDTO;
-import com.aurora.dto.UserRoleDTO;
+import com.aurora.model.dto.RoleDTO;
+import com.aurora.model.dto.UserRoleDTO;
 import com.aurora.service.RoleService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
-import com.aurora.vo.RoleVO;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
+import com.aurora.model.vo.RoleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/TagController.java

@@ -2,13 +2,13 @@ package com.aurora.controller;
 
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.TagAdminDTO;
-import com.aurora.dto.TagDTO;
+import com.aurora.model.dto.TagAdminDTO;
+import com.aurora.model.dto.TagDTO;
 import com.aurora.service.TagService;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
-import com.aurora.vo.TagVO;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
+import com.aurora.model.vo.TagVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/controller/TalkController.java

@@ -1,14 +1,14 @@
 package com.aurora.controller;
 
-import com.aurora.dto.TalkAdminDTO;
-import com.aurora.dto.TalkDTO;
+import com.aurora.model.dto.TalkAdminDTO;
+import com.aurora.model.dto.TalkDTO;
 import com.aurora.enums.FilePathEnum;
 import com.aurora.service.TalkService;
 import com.aurora.strategy.context.UploadStrategyContext;
-import com.aurora.vo.ConditionVO;
-import com.aurora.vo.PageResult;
-import com.aurora.vo.Result;
-import com.aurora.vo.TalkVO;
+import com.aurora.model.vo.ConditionVO;
+import com.aurora.model.vo.PageResult;
+import com.aurora.model.vo.Result;
+import com.aurora.model.vo.TalkVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

aurora-springboot/src/main/java/com/aurora/controller/UserAuthController.java

@@ -2,12 +2,12 @@ package com.aurora.controller;
 
 
 import com.aurora.annotation.AccessLimit;
-import com.aurora.dto.UserAdminDTO;
-import com.aurora.dto.UserAreaDTO;
-import com.aurora.dto.UserInfoDTO;
-import com.aurora.dto.UserLogoutStatusDTO;
+import com.aurora.model.dto.UserAdminDTO;
+import com.aurora.model.dto.UserAreaDTO;
+import com.aurora.model.dto.UserInfoDTO;
+import com.aurora.model.dto.UserLogoutStatusDTO;
 import com.aurora.service.UserAuthService;
-import com.aurora.vo.*;
+import com.aurora.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

aurora-springboot/src/main/java/com/aurora/controller/UserInfoController.java

@@ -1,10 +1,10 @@
 package com.aurora.controller;
 
 import com.aurora.annotation.OptLog;
-import com.aurora.dto.UserInfoDTO;
-import com.aurora.dto.UserOnlineDTO;
+import com.aurora.model.dto.UserInfoDTO;
+import com.aurora.model.dto.UserOnlineDTO;
 import com.aurora.service.UserInfoService;
-import com.aurora.vo.*;
+import com.aurora.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

aurora-springboot/src/main/java/com/aurora/filter/JwtAuthenticationTokenFilter.java

@@ -1,7 +1,7 @@
 package com.aurora.filter;
 
 
-import com.aurora.dto.UserDetailsDTO;
+import com.aurora.model.dto.UserDetailsDTO;
 import com.aurora.service.TokenService;
 import com.aurora.utils.UserUtils;
 import lombok.SneakyThrows;

aurora-springboot/src/main/java/com/aurora/handler/AccessDeniedHandlerImpl.java

@@ -2,7 +2,7 @@ package com.aurora.handler;
 
 import com.alibaba.fastjson.JSON;
 import com.aurora.constant.CommonConst;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.Result;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;

aurora-springboot/src/main/java/com/aurora/handler/AuthenticationEntryPointImpl.java

@@ -2,7 +2,7 @@ package com.aurora.handler;
 
 import com.alibaba.fastjson.JSON;
 import com.aurora.constant.CommonConst;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.Result;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;

aurora-springboot/src/main/java/com/aurora/handler/AuthenticationFailHandlerImpl.java

@@ -1,7 +1,7 @@
 package com.aurora.handler;
 
 import com.alibaba.fastjson.JSON;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.Result;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.stereotype.Component;

aurora-springboot/src/main/java/com/aurora/handler/AuthenticationSuccessHandlerImpl.java

@@ -2,14 +2,14 @@ package com.aurora.handler;
 
 import com.alibaba.fastjson.JSON;
 import com.aurora.constant.CommonConst;
-import com.aurora.dto.UserDetailsDTO;
-import com.aurora.dto.UserInfoDTO;
+import com.aurora.model.dto.UserDetailsDTO;
+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.vo.Result;
+import com.aurora.model.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.core.Authentication;
@@ -22,8 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Objects;
 
-import static com.aurora.constant.CommonConst.TRUE;
-
 
 @Component
 public class AuthenticationSuccessHandlerImpl implements AuthenticationSuccessHandler {

aurora-springboot/src/main/java/com/aurora/handler/ControllerAdviceHandler.java

@@ -1,6 +1,6 @@
 package com.aurora.handler;
 
-import com.aurora.vo.Result;
+import com.aurora.model.vo.Result;
 import com.aurora.enums.StatusCodeEnum;
 import com.aurora.exception.BizException;
 import lombok.extern.log4j.Log4j2;

aurora-springboot/src/main/java/com/aurora/handler/FilterInvocationSecurityMetadataSourceImpl.java

@@ -1,6 +1,6 @@
 package com.aurora.handler;
 
-import com.aurora.dto.ResourceRoleDTO;
+import com.aurora.model.dto.ResourceRoleDTO;
 import com.aurora.mapper.RoleMapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

aurora-springboot/src/main/java/com/aurora/interceptor/AccessLimitInterceptor.java

@@ -1,14 +1,15 @@
-package com.aurora.handler;
+package com.aurora.interceptor;
 
 import com.alibaba.fastjson.JSON;
 
 import com.aurora.annotation.AccessLimit;
 import com.aurora.service.RedisService;
 import com.aurora.utils.IpUtils;
-import com.aurora.vo.Result;
+import com.aurora.model.vo.Result;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.RedisConnectionFailureException;
+import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -25,7 +26,8 @@ import static com.aurora.constant.CommonConst.APPLICATION_JSON;
  * 限流逻辑
  */
 @Log4j2
-public class WebSecurityHandler implements HandlerInterceptor {
+@Component
+public class AccessLimitInterceptor implements HandlerInterceptor {
 
     @Autowired
     private RedisService redisService;
@@ -47,7 +49,7 @@ public class WebSecurityHandler implements HandlerInterceptor {
                     // 此操作代表获取该key对应的值自增1后的结果
                     long q = redisService.incrExpire(key, seconds);
                     if (q > maxCount) {
-                        render(httpServletResponse, Result.fail("请求过于频繁，"+seconds+"秒后再试"));
+                        render(httpServletResponse, Result.fail("请求过于频繁，" + seconds + "秒后再试"));
                         log.warn(key + "请求次数超过每" + seconds + "秒" + maxCount + "次");
                         return false;
                     }

aurora-springboot/src/main/java/com/aurora/interceptor/PaginationInterceptor.java

@@ -1,7 +1,8 @@
-package com.aurora.handler;
+package com.aurora.interceptor;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.aurora.utils.PageUtils;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -16,7 +17,8 @@ import static com.aurora.constant.CommonConst.*;
  * @author 花未眠
  * 分页拦截器
  **/
-public class PageableHandlerInterceptor implements HandlerInterceptor {
+@Component
+public class PaginationInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {

aurora-springboot/src/main/java/com/aurora/mapper/ArticleMapper.java

@@ -1,11 +1,11 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.ArticleAdminDTO;
-import com.aurora.dto.ArticleCardDTO;
-import com.aurora.dto.ArticleDTO;
-import com.aurora.dto.ArticleStatisticsDTO;
+import com.aurora.model.dto.ArticleAdminDTO;
+import com.aurora.model.dto.ArticleCardDTO;
+import com.aurora.model.dto.ArticleDTO;
+import com.aurora.model.dto.ArticleStatisticsDTO;
 import com.aurora.entity.Article;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/CategoryMapper.java

@@ -1,9 +1,9 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.CategoryAdminDTO;
-import com.aurora.dto.CategoryDTO;
+import com.aurora.model.dto.CategoryAdminDTO;
+import com.aurora.model.dto.CategoryDTO;
 import com.aurora.entity.Category;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/CommentMapper.java

@@ -1,12 +1,12 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.CommentAdminDTO;
-import com.aurora.dto.CommentCountDTO;
-import com.aurora.dto.CommentDTO;
-import com.aurora.dto.ReplyDTO;
+import com.aurora.model.dto.CommentAdminDTO;
+import com.aurora.model.dto.CommentCountDTO;
+import com.aurora.model.dto.CommentDTO;
+import com.aurora.model.dto.ReplyDTO;
 import com.aurora.entity.Comment;
-import com.aurora.vo.CommentVO;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.CommentVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/ElasticsearchMapper.java

@@ -1,6 +1,6 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.ArticleSearchDTO;
+import com.aurora.model.dto.ArticleSearchDTO;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.stereotype.Repository;
 

aurora-springboot/src/main/java/com/aurora/mapper/JobMapper.java

@@ -1,8 +1,8 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.JobDTO;
+import com.aurora.model.dto.JobDTO;
 import com.aurora.entity.Job;
-import com.aurora.vo.JobSearchVO;
+import com.aurora.model.vo.JobSearchVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/PhotoAlbumMapper.java

@@ -1,8 +1,8 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.PhotoAlbumAdminDTO;
+import com.aurora.model.dto.PhotoAlbumAdminDTO;
 import com.aurora.entity.PhotoAlbum;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/RoleMapper.java

@@ -1,9 +1,9 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.ResourceRoleDTO;
-import com.aurora.dto.RoleDTO;
+import com.aurora.model.dto.ResourceRoleDTO;
+import com.aurora.model.dto.RoleDTO;
 import com.aurora.entity.Role;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/TagMapper.java

@@ -1,9 +1,9 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.TagAdminDTO;
-import com.aurora.dto.TagDTO;
+import com.aurora.model.dto.TagAdminDTO;
+import com.aurora.model.dto.TagDTO;
 import com.aurora.entity.Tag;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/TalkMapper.java

@@ -1,9 +1,9 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.TalkAdminDTO;
-import com.aurora.dto.TalkDTO;
+import com.aurora.model.dto.TalkAdminDTO;
+import com.aurora.model.dto.TalkDTO;
 import com.aurora.entity.Talk;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/mapper/UniqueViewMapper.java

@@ -1,6 +1,6 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.UniqueViewDTO;
+import com.aurora.model.dto.UniqueViewDTO;
 import com.aurora.entity.UniqueView;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

aurora-springboot/src/main/java/com/aurora/mapper/UserAuthMapper.java

@@ -1,8 +1,8 @@
 package com.aurora.mapper;
 
-import com.aurora.dto.UserAdminDTO;
+import com.aurora.model.dto.UserAdminDTO;
 import com.aurora.entity.UserAuth;
-import com.aurora.vo.ConditionVO;
+import com.aurora.model.vo.ConditionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

aurora-springboot/src/main/java/com/aurora/model/dto/AboutDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ArchiveDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 
 import io.swagger.annotations.ApiModel;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleCardDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import com.aurora.entity.Tag;
 import com.aurora.entity.UserInfo;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import com.aurora.entity.Tag;
 import com.aurora.entity.UserInfo;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleRankDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleSearchDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ArticleStatisticsDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/AuroraAdminInfoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/AuroraBackInfoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/AuroraHomeInfoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/CategoryAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/CategoryDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/CategoryOptionDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/CommentAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 
 import lombok.AllArgsConstructor;

aurora-springboot/src/main/java/com/aurora/model/dto/CommentCountDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/CommentDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/EmailDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ExceptionLogDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 
 import lombok.AllArgsConstructor;

aurora-springboot/src/main/java/com/aurora/model/dto/FriendLinkAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.Builder;
 import lombok.Data;

aurora-springboot/src/main/java/com/aurora/model/dto/FriendLinkDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/JobDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/JobLogDTO.java

@@ -1,10 +1,5 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

aurora-springboot/src/main/java/com/aurora/model/dto/LabelOptionDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/MaxwellDataDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/MenuDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/OperationLogDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/PhotoAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/PhotoAlbumAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/PhotoAlbumDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/PhotoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/QQTokenDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/QQUserInfoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ReplyDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ResourceDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/ResourceRoleDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.Data;
 

aurora-springboot/src/main/java/com/aurora/model/dto/RoleDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 
 import lombok.AllArgsConstructor;

aurora-springboot/src/main/java/com/aurora/model/dto/SocialTokenDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/SocialUserInfoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/TagAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/TagDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 
 import lombok.AllArgsConstructor;

aurora-springboot/src/main/java/com/aurora/model/dto/TalkAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/TalkDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/TopAndFeaturedArticlesDTO.java

@@ -1,6 +1,5 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
-import com.aurora.entity.Article;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

aurora-springboot/src/main/java/com/aurora/model/dto/UniqueViewDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserAdminDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserAreaDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserDetailsDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import com.aurora.constant.CommonConst;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

aurora-springboot/src/main/java/com/aurora/model/dto/UserInfoDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserLogoutStatusDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserMenuDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserOnlineDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/UserRoleDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

aurora-springboot/src/main/java/com/aurora/model/dto/WebsiteConfigDTO.java

@@ -1,4 +1,4 @@
-package com.aurora.dto;
+package com.aurora.model.dto;
 
 
 import lombok.AllArgsConstructor;
@@ -6,8 +6,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @Builder
 @NoArgsConstructor