refactor: 包结构优化

src/main/java/com/youlai/system/common/enums/CaptchaTypeEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.system.enums;
+package com.youlai.system.common.enums;
 
 /**
  * EasyCaptcha 验证码类型枚举

src/main/java/com/youlai/system/common/enums/DataScopeEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.system.enums;
+package com.youlai.system.common.enums;
 
 import com.youlai.system.common.base.IBaseEnum;
 import lombok.Getter;

src/main/java/com/youlai/system/common/enums/GenderEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.system.enums;
+package com.youlai.system.common.enums;
 
 import com.youlai.system.common.base.IBaseEnum;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.system.enums;
+package com.youlai.system.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.youlai.system.common.base.IBaseEnum;

src/main/java/com/youlai/system/common/enums/StatusEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.system.enums;
+package com.youlai.system.common.enums;
 
 import com.youlai.system.common.base.IBaseEnum;
 import lombok.Getter;

src/main/java/com/youlai/system/common/util/DateUtils.java

@@ -1,5 +1,5 @@
 
-package com.youlai.system.util;
+package com.youlai.system.common.util;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;

src/main/java/com/youlai/system/common/util/ExcelUtils.java

@@ -1,4 +1,4 @@
-package com.youlai.system.util;
+package com.youlai.system.common.util;
 
 import com.alibaba.excel.EasyExcel;
 import com.youlai.system.plugin.easyexcel.MyAnalysisEventListener;

src/main/java/com/youlai/system/common/util/ResponseUtils.java

@@ -1,4 +1,4 @@
-package com.youlai.system.util;
+package com.youlai.system.common.util;
 
 import cn.hutool.json.JSONUtil;
 import com.youlai.system.common.result.IResultCode;

src/main/java/com/youlai/system/config/MybatisConfig.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.youlai.system.core.mybatis.handler.MyDataPermissionHandler;
-import com.youlai.system.core.mybatis.handler.MyMetaObjectHandler;
+import com.youlai.system.plugin.mybatis.handler.MyDataPermissionHandler;
+import com.youlai.system.plugin.mybatis.handler.MyMetaObjectHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

src/main/java/com/youlai/system/config/SecurityConfig.java

@@ -1,8 +1,8 @@
 package com.youlai.system.config;
 
 import com.youlai.system.common.constant.SecurityConstants;
-import com.youlai.system.core.security.exception.MyAccessDeniedHandler;
-import com.youlai.system.core.security.exception.MyAuthenticationEntryPoint;
+import com.youlai.system.security.exception.MyAccessDeniedHandler;
+import com.youlai.system.security.exception.MyAuthenticationEntryPoint;
 import com.youlai.system.filter.JwtTokenFilter;
 import com.youlai.system.filter.VerifyCodeFilter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/youlai/system/config/WebSocketConfig.java

@@ -1,7 +1,7 @@
 package com.youlai.system.config;
 
 import cn.hutool.core.util.StrUtil;
-import com.youlai.system.util.JwtUtils;
+import com.youlai.system.security.util.JwtUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;

src/main/java/com/youlai/system/controller/SysUserController.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.util.ExcelUtils;
+import com.youlai.system.common.util.ExcelUtils;
 import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
 import com.youlai.system.plugin.easyexcel.UserImportListener;
 import com.youlai.system.model.vo.UserImportVO;

src/main/java/com/youlai/system/converter/UserConverter.java

@@ -23,7 +23,7 @@ import org.mapstruct.Mappings;
 public interface UserConverter {
 
     @Mappings({
-            @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.system.enums.GenderEnum.class))")
+            @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.system.common.enums.GenderEnum.class))")
     })
     UserPageVO toPageVo(UserBO bo);
 

src/main/java/com/youlai/system/filter/JwtTokenFilter.java

@@ -2,19 +2,17 @@ package com.youlai.system.filter;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.jwt.JWTPayload;
 import com.youlai.system.common.constant.CacheConstants;
 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.util.JwtUtils;
-import com.youlai.system.util.ResponseUtils;
+import com.youlai.system.security.util.JwtUtils;
+import com.youlai.system.common.util.ResponseUtils;
 import com.youlai.system.common.exception.BusinessException;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -52,7 +50,7 @@ public class JwtTokenFilter extends OncePerRequestFilter {
 
                 String jti = Convert.toStr(payload.get(JWTPayload.JWT_ID));
                 Boolean isTokenBlacklisted  = redisTemplate.hasKey(CacheConstants.BLACKLIST_TOKEN_PREFIX + jti);
-                if (isTokenBlacklisted ) {
+                if (Boolean.TRUE.equals(isTokenBlacklisted)) {
                     ResponseUtils.writeErrMsg(response, ResultCode.TOKEN_INVALID);
                     return;
                 }

src/main/java/com/youlai/system/filter/VerifyCodeFilter.java

@@ -6,7 +6,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.youlai.system.common.constant.CacheConstants;
 import com.youlai.system.common.constant.SecurityConstants;
 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.util.ResponseUtils;
+import com.youlai.system.common.util.ResponseUtils;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/youlai/system/mapper/SysDeptMapper.java

@@ -3,7 +3,7 @@ package com.youlai.system.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.youlai.system.core.mybatis.annotation.DataPermission;
+import com.youlai.system.plugin.mybatis.annotation.DataPermission;
 import com.youlai.system.model.entity.SysDept;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/youlai/system/mapper/SysUserMapper.java

@@ -2,7 +2,7 @@ package com.youlai.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.core.mybatis.annotation.DataPermission;
+import com.youlai.system.plugin.mybatis.annotation.DataPermission;
 import com.youlai.system.model.bo.UserBO;
 import com.youlai.system.model.entity.SysUser;
 import com.youlai.system.model.dto.UserAuthInfo;

src/main/java/com/youlai/system/model/bo/RouteBO.java

@@ -1,6 +1,6 @@
 package com.youlai.system.model.bo;
 
-import com.youlai.system.enums.MenuTypeEnum;
+import com.youlai.system.common.enums.MenuTypeEnum;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/youlai/system/model/entity/SysMenu.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.youlai.system.common.base.BaseEntity;
-import com.youlai.system.enums.MenuTypeEnum;
+import com.youlai.system.common.enums.MenuTypeEnum;
 import lombok.Data;
 
 /**

src/main/java/com/youlai/system/model/form/MenuForm.java

@@ -1,7 +1,7 @@
 package com.youlai.system.model.form;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.youlai.system.enums.MenuTypeEnum;
+import com.youlai.system.common.enums.MenuTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

src/main/java/com/youlai/system/model/vo/MenuVO.java

@@ -1,7 +1,7 @@
 package com.youlai.system.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.youlai.system.enums.MenuTypeEnum;
+import com.youlai.system.common.enums.MenuTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

src/main/java/com/youlai/system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java

@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
 import com.youlai.system.common.result.ResultCode;
 import com.youlai.system.common.exception.BusinessException;
-import com.youlai.system.util.JwtUtils;
+import com.youlai.system.security.util.JwtUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/system/plugin/easyexcel/UserImportListener.java

@@ -9,8 +9,8 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.youlai.system.common.base.IBaseEnum;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.enums.GenderEnum;
-import com.youlai.system.enums.StatusEnum;
+import com.youlai.system.common.enums.GenderEnum;
+import com.youlai.system.common.enums.StatusEnum;
 import com.youlai.system.converter.UserConverter;
 import com.youlai.system.model.entity.SysRole;
 import com.youlai.system.model.entity.SysUser;

src/main/java/com/youlai/system/plugin/mybatis/annotation/DataPermission.java

@@ -1,4 +1,4 @@
-package com.youlai.system.core.mybatis.annotation;
+package com.youlai.system.plugin.mybatis.annotation;
 
 import java.lang.annotation.*;
 

src/main/java/com/youlai/system/plugin/mybatis/handler/MyDataPermissionHandler.java

@@ -1,12 +1,12 @@
-package com.youlai.system.core.mybatis.handler;
+package com.youlai.system.plugin.mybatis.handler;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
-import com.youlai.system.core.mybatis.annotation.DataPermission;
+import com.youlai.system.plugin.mybatis.annotation.DataPermission;
 import com.youlai.system.common.base.IBaseEnum;
-import com.youlai.system.enums.DataScopeEnum;
-import com.youlai.system.util.SecurityUtils;
+import com.youlai.system.common.enums.DataScopeEnum;
+import com.youlai.system.security.util.SecurityUtils;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;

src/main/java/com/youlai/system/plugin/mybatis/handler/MyMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package com.youlai.system.core.mybatis.handler;
+package com.youlai.system.plugin.mybatis.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;

src/main/java/com/youlai/system/plugin/rabbitmq/TestListener.java

@@ -1,8 +0,0 @@
-package com.youlai.system.plugin.rabbitmq;
-
-/**
- * @author haoxr
- * @since 0.0.1
- */
-public class TestListener {
-}

src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java

@@ -1,7 +1,7 @@
-package com.youlai.system.core.security.exception;
+package com.youlai.system.security.exception;
 
 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.util.ResponseUtils;
+import com.youlai.system.common.util.ResponseUtils;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;

src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java

@@ -1,7 +1,7 @@
-package com.youlai.system.core.security.exception;
+package com.youlai.system.security.exception;
 
 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.util.ResponseUtils;
+import com.youlai.system.common.util.ResponseUtils;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;

src/main/java/com/youlai/system/security/model/SysUserDetails.java

@@ -1,4 +1,4 @@
-package com.youlai.system.core.security.model;
+package com.youlai.system.security.model;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;

src/main/java/com/youlai/system/security/service/PermissionService.java

@@ -1,9 +1,9 @@
-package com.youlai.system.core.security.service;
+package com.youlai.system.security.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.youlai.system.common.constant.CacheConstants;
-import com.youlai.system.util.SecurityUtils;
+import com.youlai.system.security.util.SecurityUtils;
 import com.youlai.system.model.bo.RolePermsBO;
 import com.youlai.system.service.SysRoleMenuService;
 import jakarta.annotation.PostConstruct;

src/main/java/com/youlai/system/security/service/SysUserDetailsService.java

@@ -1,6 +1,6 @@
-package com.youlai.system.core.security.service;
+package com.youlai.system.security.service;
 
-import com.youlai.system.core.security.model.SysUserDetails;
+import com.youlai.system.security.model.SysUserDetails;
 import com.youlai.system.model.dto.UserAuthInfo;
 import com.youlai.system.service.SysUserService;
 import lombok.RequiredArgsConstructor;

src/main/java/com/youlai/system/security/util/JwtUtils.java

@@ -1,4 +1,4 @@
-package com.youlai.system.util;
+package com.youlai.system.security.util;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -9,7 +9,7 @@ import cn.hutool.jwt.JWT;
 import cn.hutool.jwt.JWTPayload;
 import cn.hutool.jwt.JWTUtil;
 import com.youlai.system.common.constant.JwtClaimConstants;
-import com.youlai.system.core.security.model.SysUserDetails;
+import com.youlai.system.security.model.SysUserDetails;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -126,27 +126,4 @@ public class JwtUtils {
 
         return new UsernamePasswordAuthenticationToken(userDetails, "", authorities);
     }
-
-
-    /**
-     * 验证 JWT Token
-     *
-     * @param token JWT Token
-     * @return 是否有效
-     */
-    public static boolean verifyToken(String token) {
-
-        if (StrUtil.isBlank(token)) {
-            return false;
-        }
-
-        if (token.startsWith("Bearer ")) {
-            token = token.substring(7);
-        }
-
-        JWT jwt = JWTUtil.parseToken(token);
-        return jwt.setKey(JwtUtils.key).validate(0);
-
-    }
-
 }

src/main/java/com/youlai/system/security/util/SecurityUtils.java

@@ -1,10 +1,10 @@
-package com.youlai.system.util;
+package com.youlai.system.security.util;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.core.security.model.SysUserDetails;
+import com.youlai.system.security.model.SysUserDetails;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;

src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java

@@ -8,12 +8,12 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.jwt.JWTPayload;
 import com.youlai.system.common.constant.CacheConstants;
-import com.youlai.system.enums.CaptchaTypeEnum;
+import com.youlai.system.common.enums.CaptchaTypeEnum;
 import com.youlai.system.model.dto.CaptchaResult;
 import com.youlai.system.model.dto.LoginResult;
 import com.youlai.system.plugin.captcha.CaptchaProperties;
 import com.youlai.system.service.AuthService;
-import com.youlai.system.util.JwtUtils;
+import com.youlai.system.security.util.JwtUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.enums.StatusEnum;
+import com.youlai.system.common.enums.StatusEnum;
 import com.youlai.system.converter.DeptConverter;
 import com.youlai.system.mapper.SysDeptMapper;
 import com.youlai.system.model.entity.SysDept;

src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.enums.MenuTypeEnum;
-import com.youlai.system.enums.StatusEnum;
+import com.youlai.system.common.enums.MenuTypeEnum;
+import com.youlai.system.common.enums.StatusEnum;
 import com.youlai.system.common.model.Option;
 import com.youlai.system.converter.MenuConverter;
 import com.youlai.system.mapper.SysMenuMapper;

src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.common.constant.SystemConstants;
 import com.youlai.system.common.model.Option;
 import com.youlai.system.converter.RoleConverter;
-import com.youlai.system.core.security.service.PermissionService;
+import com.youlai.system.security.service.PermissionService;
 import com.youlai.system.mapper.SysRoleMapper;
 import com.youlai.system.model.entity.SysRole;
 import com.youlai.system.model.entity.SysRoleMenu;
@@ -20,7 +20,7 @@ import com.youlai.system.model.vo.RolePageVO;
 import com.youlai.system.service.SysRoleMenuService;
 import com.youlai.system.service.SysRoleService;
 import com.youlai.system.service.SysUserRoleService;
-import com.youlai.system.util.SecurityUtils;
+import com.youlai.system.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;

src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java

@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.util.DateUtils;
+import com.youlai.system.common.util.DateUtils;
 import com.youlai.system.converter.UserConverter;
-import com.youlai.system.util.SecurityUtils;
+import com.youlai.system.security.util.SecurityUtils;
 import com.youlai.system.mapper.SysUserMapper;
 import com.youlai.system.model.dto.UserAuthInfo;
 import com.youlai.system.model.bo.UserBO;