refactor: 项目目录重构

src/main/java/com/youlai/boot/YouLaiBootApplication.java

@@ -5,11 +5,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+/**
+ *
+ * @author Ray
+ */
 @SpringBootApplication
 @ConfigurationPropertiesScan
 @EnableScheduling
-public class BootApplication {
+public class YouLaiBootApplication {
+
     public static void main(String[] args) {
-        SpringApplication.run(BootApplication.class, args);
+        SpringApplication.run(YouLaiBootApplication.class, args);
     }
+
 }

src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java

@@ -1,6 +1,6 @@
 package com.youlai.boot.common.annotation;
 
-import com.youlai.system.enums.LogModuleEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
 
 import java.lang.annotation.*;
 

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

@@ -1,6 +1,6 @@
 package com.youlai.boot.common.enums;
 
-import com.youlai.system.common.base.IBaseEnum;
+import com.youlai.boot.common.base.IBaseEnum;
 import lombok.Getter;
 
 /**

src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java

@@ -3,7 +3,7 @@ package com.youlai.boot.common.enums;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.youlai.system.common.base.IBaseEnum;
+import com.youlai.boot.common.base.IBaseEnum;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

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

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

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

@@ -1,7 +1,7 @@
 package com.youlai.boot.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.youlai.system.common.base.IBaseEnum;
+import com.youlai.boot.common.base.IBaseEnum;
 import lombok.Getter;
 
 /**

src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java

@@ -3,7 +3,7 @@ package com.youlai.boot.common.enums;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.youlai.system.common.base.IBaseEnum;
+import com.youlai.boot.common.base.IBaseEnum;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

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

@@ -1,6 +1,6 @@
 package com.youlai.boot.common.enums;
 
-import com.youlai.system.common.base.IBaseEnum;
+import com.youlai.boot.common.base.IBaseEnum;
 import lombok.Getter;
 
 /**

src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java

@@ -2,8 +2,8 @@ package com.youlai.boot.common.exception;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.youlai.system.common.result.Result;
-import com.youlai.system.common.result.ResultCode;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.common.result.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.context.support.DefaultMessageSourceResolvable;

src/main/java/com/youlai/boot/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.plugin.mybatis.handler.MyDataPermissionHandler;
-import com.youlai.system.plugin.mybatis.handler.MyMetaObjectHandler;
+import com.youlai.boot.core.handler.MyDataPermissionHandler;
+import com.youlai.boot.core.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/boot/config/SecurityConfig.java

@@ -4,12 +4,12 @@ import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.collection.CollectionUtil;
 import com.youlai.boot.common.constant.SecurityConstants;
 import com.youlai.boot.config.property.SecurityProperties;
-import com.youlai.boot.framework.filter.RateLimiterFilter;
-import com.youlai.boot.framework.security.exception.MyAccessDeniedHandler;
-import com.youlai.boot.framework.security.exception.MyAuthenticationEntryPoint;
-import com.youlai.boot.framework.security.filter.JwtValidationFilter;
-import com.youlai.boot.framework.security.filter.CaptchaValidationFilter;
-import com.youlai.boot.module.system.service.SysConfigService;
+import com.youlai.boot.core.filter.RateLimiterFilter;
+import com.youlai.boot.core.security.exception.MyAccessDeniedHandler;
+import com.youlai.boot.core.security.exception.MyAuthenticationEntryPoint;
+import com.youlai.boot.core.security.filter.JwtValidationFilter;
+import com.youlai.boot.core.security.filter.CaptchaValidationFilter;
+import com.youlai.boot.system.service.SysConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -47,8 +47,6 @@ public class SecurityConfig {
     private final SecurityProperties securityProperties;
     private final SysConfigService sysConfigService;
 
-
-
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http

src/main/java/com/youlai/boot/config/SwaggerConfig.java

@@ -68,7 +68,7 @@ public class SwaggerConfig {
             if (openApi.getPaths() != null) {
                 openApi.getPaths().forEach((s, pathItem) -> {
                     // 登录接口/验证码不需要添加鉴权参数
-                    if (s.equals("/api/v1/auth/login") || s.equals("/api/v1/auth/captcha")) {
+                    if ("/api/v1/auth/login".equals(s) || "/api/v1/auth/captcha".equals(s)) {
                         return;
                     }
                     // 接口添加鉴权参数

src/main/java/com/youlai/boot/config/WebMvcConfig.java

@@ -21,9 +21,7 @@ import org.springframework.validation.beanvalidation.SpringConstraintValidatorFa
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.math.BigInteger;
-import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * WebMvc 自动装配配置

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

@@ -3,9 +3,9 @@ package com.youlai.boot.config;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.jwt.JWTPayload;
 import cn.hutool.jwt.JWTUtil;
-import com.youlai.system.common.constant.SecurityConstants;
-import com.youlai.boot.module.system.event.UserConnectionEvent;
-import com.youlai.system.service.WebsocketService;
+import com.youlai.boot.common.constant.SecurityConstants;
+import com.youlai.boot.system.event.UserConnectionEvent;
+import com.youlai.boot.system.service.WebsocketService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.ApplicationEventPublisher;

src/main/java/com/youlai/boot/core/aspect/LogAspect.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.aspect;
+package com.youlai.boot.core.aspect;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
@@ -7,10 +7,10 @@ import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.youlai.boot.common.constant.SecurityConstants;
 import com.youlai.boot.common.util.IPUtils;
-import com.youlai.boot.module.system.model.entity.SysLog;
+import com.youlai.boot.system.model.entity.SysLog;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.boot.framework.security.util.SecurityUtils;
-import com.youlai.boot.module.system.service.SysLogService;
+import com.youlai.boot.core.security.util.SecurityUtils;
+import com.youlai.boot.system.service.SysLogService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.aspect;
+package com.youlai.boot.core.aspect;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.jwt.JWTUtil;

src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java

@@ -1,10 +1,10 @@
-package com.youlai.boot.framework.filter;
+package com.youlai.boot.core.filter;
 
 import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.result.ResultCode;
 import com.youlai.boot.common.util.IPUtils;
 import com.youlai.boot.common.util.ResponseUtils;
-import com.youlai.boot.module.system.service.SysConfigService;
+import com.youlai.boot.system.service.SysConfigService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.filter;
+package com.youlai.boot.core.filter;
 
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java

@@ -0,0 +1,100 @@
+package com.youlai.boot.core.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.boot.common.annotation.DataPermission;
+import com.youlai.boot.common.base.IBaseEnum;
+import com.youlai.boot.common.enums.DataScopeEnum;
+import com.youlai.boot.core.security.util.SecurityUtils;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+
+import java.lang.reflect.Method;
+
+/**
+ * 数据权限控制器
+ *
+ * @author zc
+ * @since 2021-12-10 13:28
+ */
+@Slf4j
+public class MyDataPermissionHandler implements DataPermissionHandler {
+
+    @Override
+    @SneakyThrows
+    public Expression getSqlSegment(Expression where, String mappedStatementId) {
+
+        Class<?> clazz = Class.forName(mappedStatementId.substring(0, mappedStatementId.lastIndexOf(StringPool.DOT)));
+        String methodName = mappedStatementId.substring(mappedStatementId.lastIndexOf(StringPool.DOT) + 1);
+        Method[] methods = clazz.getDeclaredMethods();
+        for (Method method : methods) {
+            if (method.getName().equals(methodName)) {
+            DataPermission annotation = method.getAnnotation(DataPermission.class);
+            // 如果没有注解或者是超级管理员，直接返回
+            if (annotation == null || SecurityUtils.isRoot() ) {
+                return where;
+            }
+                return dataScopeFilter(annotation.deptAlias(), annotation.deptIdColumnName(), annotation.userAlias(), annotation.userIdColumnName(), where);
+            }
+        }
+        return where;
+    }
+
+    /**
+     * 构建过滤条件
+     *
+     * @param where 当前查询条件
+     * @return 构建后查询条件
+     */
+    @SneakyThrows
+    public static Expression dataScopeFilter(String deptAlias, String deptIdColumnName, String userAlias, String userIdColumnName, Expression where) {
+
+
+        String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias + StringPool.DOT + deptIdColumnName) : deptIdColumnName;
+        String userColumnName = StrUtil.isNotBlank(userAlias) ? (userAlias + StringPool.DOT + userIdColumnName) : userIdColumnName;
+
+        // 获取当前用户的数据权限
+        Integer dataScope = SecurityUtils.getDataScope();
+
+        DataScopeEnum dataScopeEnum = IBaseEnum.getEnumByValue(dataScope, DataScopeEnum.class);
+
+        Long deptId, userId;
+        String appendSqlStr;
+        switch (dataScopeEnum) {
+            case ALL:
+                return where;
+            case DEPT:
+                deptId = SecurityUtils.getDeptId();
+                appendSqlStr = deptColumnName + StringPool.EQUALS + deptId;
+                break;
+            case SELF:
+                userId = SecurityUtils.getUserId();
+                appendSqlStr = userColumnName + StringPool.EQUALS + userId;
+                break;
+            // 默认部门及子部门数据权限
+            default:
+                deptId = SecurityUtils.getDeptId();
+                appendSqlStr = deptColumnName + " IN ( SELECT id FROM sys_dept WHERE id = " + deptId + " OR FIND_IN_SET( " + deptId + " , tree_path ) )";
+                break;
+        }
+
+        if (StrUtil.isBlank(appendSqlStr)) {
+            return where;
+        }
+
+        Expression appendExpression = CCJSqlParserUtil.parseCondExpression(appendSqlStr);
+
+        if (where == null) {
+            return appendExpression;
+        }
+
+        return new AndExpression(where, appendExpression);
+    }
+
+
+}
+

src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java

@@ -0,0 +1,39 @@
+package com.youlai.boot.core.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * mybatis-plus 字段自动填充
+ *
+ * @author haoxr
+ * @since 2022/10/14
+ */
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    /**
+     * 新增填充创建时间
+     *
+     * @param metaObject 元数据
+     */
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class);
+        this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class);
+    }
+
+    /**
+     * 更新填充更新时间
+     *
+     * @param metaObject 元数据
+     */
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class);
+    }
+
+}

src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java

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

src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java

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

src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.security.filter;
+package com.youlai.boot.core.security.filter;
 
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.StrUtil;

src/main/java/com/youlai/boot/core/security/filter/JwtValidationFilter.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.security.filter;
+package com.youlai.boot.core.security.filter;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
@@ -7,7 +7,7 @@ import cn.hutool.jwt.JWTPayload;
 import cn.hutool.jwt.JWTUtil;
 import com.youlai.boot.common.constant.SecurityConstants;
 import com.youlai.boot.common.result.ResultCode;
-import com.youlai.boot.framework.security.util.JwtUtils;
+import com.youlai.boot.core.security.util.JwtUtils;
 import com.youlai.boot.common.util.ResponseUtils;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.framework.security.model;
+package com.youlai.boot.core.security.model;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.youlai.boot.module.system.model.dto.UserAuthInfo;
+import com.youlai.boot.system.model.dto.UserAuthInfo;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/youlai/boot/core/security/service/PermissionService.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.framework.security.service;
+package com.youlai.boot.core.security.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.system.common.constant.SecurityConstants;
-import com.youlai.boot.framework.security.util.SecurityUtils;
+import com.youlai.boot.common.constant.SecurityConstants;
+import com.youlai.boot.core.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.framework.security.service;
+package com.youlai.boot.core.security.service;
 
-import com.youlai.boot.framework.security.model.SysUserDetails;
-import com.youlai.boot.module.system.model.dto.UserAuthInfo;
-import com.youlai.boot.module.system.service.SysUserService;
+import com.youlai.boot.core.security.model.SysUserDetails;
+import com.youlai.boot.system.model.dto.UserAuthInfo;
+import com.youlai.boot.system.service.SysUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.userdetails.UserDetails;

src/main/java/com/youlai/boot/core/security/util/JwtUtils.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.security.util;
+package com.youlai.boot.core.security.util;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -6,8 +6,8 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.jwt.JWTPayload;
 import cn.hutool.jwt.JWTUtil;
-import com.youlai.system.common.constant.JwtClaimConstants;
-import com.youlai.boot.framework.security.model.SysUserDetails;
+import com.youlai.boot.common.constant.JwtClaimConstants;
+import com.youlai.boot.core.security.model.SysUserDetails;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.framework.security.util;
+package com.youlai.boot.core.security.util;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.boot.framework.security.model.SysUserDetails;
+import com.youlai.boot.common.constant.SystemConstants;
+import com.youlai.boot.core.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/boot/infrastructure/auth/controller/AuthController.java

@@ -1,11 +1,11 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.infrastructure.auth.controller;
 
-import com.youlai.system.enums.LogModuleEnum;
-import com.youlai.system.common.result.Result;
-import com.youlai.boot.module.system.model.dto.CaptchaResult;
-import com.youlai.boot.module.system.model.dto.LoginResult;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.infrastructure.auth.service.AuthService;
+import com.youlai.boot.system.model.dto.CaptchaResult;
+import com.youlai.boot.system.model.dto.LoginResult;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.system.service.AuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.system.service;
+package com.youlai.boot.infrastructure.auth.service;
 
-import com.youlai.boot.module.system.model.dto.CaptchaResult;
-import com.youlai.boot.module.system.model.dto.LoginResult;
+import com.youlai.boot.system.model.dto.CaptchaResult;
+import com.youlai.boot.system.model.dto.LoginResult;
 
 /**
  * 认证服务接口

src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.service.impl;
+package com.youlai.boot.infrastructure.auth.service.impl;
 
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.CaptchaUtil;
@@ -8,13 +8,13 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.jwt.JWTPayload;
 import cn.hutool.jwt.JWTUtil;
-import com.youlai.system.common.constant.SecurityConstants;
-import com.youlai.system.enums.CaptchaTypeEnum;
-import com.youlai.boot.module.system.model.dto.CaptchaResult;
-import com.youlai.boot.module.system.model.dto.LoginResult;
+import com.youlai.boot.common.constant.SecurityConstants;
+import com.youlai.boot.common.enums.CaptchaTypeEnum;
+import com.youlai.boot.infrastructure.auth.service.AuthService;
+import com.youlai.boot.system.model.dto.CaptchaResult;
+import com.youlai.boot.system.model.dto.LoginResult;
 import com.youlai.boot.config.property.CaptchaProperties;
-import com.youlai.system.service.AuthService;
-import com.youlai.boot.framework.security.util.JwtUtils;
+import com.youlai.boot.core.security.util.JwtUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.infrastructure.file.controller;
 
-import com.youlai.system.common.result.Result;
-import com.youlai.boot.module.system.model.dto.FileInfo;
-import com.youlai.system.service.OssService;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.infrastructure.file.service.FileService;
+import com.youlai.boot.system.model.dto.FileInfo;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -25,7 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 @RequiredArgsConstructor
 public class FileController {
 
-    private final OssService ossService;
+    private final FileService fileService;
 
     @PostMapping
     @Operation(summary = "文件上传")
@@ -33,7 +33,7 @@ public class FileController {
             @Parameter(name = "file", description = "表单文件对象", required = true, in = ParameterIn.DEFAULT, schema = @Schema(name = "file", format = "binary"))
             @RequestPart(value = "file") MultipartFile file
     ) {
-        FileInfo fileInfo = ossService.uploadFile(file);
+        FileInfo fileInfo = fileService.uploadFile(file);
         return Result.success(fileInfo);
     }
 
@@ -43,7 +43,7 @@ public class FileController {
     public Result<?> deleteFile(
             @Parameter(description = "文件路径") @RequestParam String filePath
     ) {
-        boolean result = ossService.deleteFile(filePath);
+        boolean result = fileService.deleteFile(filePath);
         return Result.judge(result);
     }
 }

src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java

@@ -1,6 +1,6 @@
-package com.youlai.boot.common.service;
+package com.youlai.boot.infrastructure.file.service;
 
-import com.youlai.boot.module.system.model.dto.FileInfo;
+import com.youlai.boot.system.model.dto.FileInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author haoxr
  * @since 2022/11/19
  */
-public interface OssService {
+public interface FileService {
 
     /**
      * 上传文件

src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.service.impl;
+package com.youlai.boot.infrastructure.file.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
@@ -8,8 +8,8 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.ObjectMetadata;
 import com.aliyun.oss.model.PutObjectRequest;
-import com.youlai.boot.module.system.model.dto.FileInfo;
-import com.youlai.system.service.OssService;
+import com.youlai.boot.infrastructure.file.service.FileService;
+import com.youlai.boot.system.model.dto.FileInfo;
 import jakarta.annotation.PostConstruct;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +33,7 @@ import java.time.LocalDateTime;
 @ConfigurationProperties(prefix = "oss.aliyun")
 @RequiredArgsConstructor
 @Data
-public class AliyunOssService implements OssService {
+public class AliyunFileService implements FileService {
     /**
      * 服务Endpoint
      */

src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java

@@ -1,12 +1,12 @@
-package com.youlai.boot.common.service.impl;
+package com.youlai.boot.infrastructure.file.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.boot.module.system.model.dto.FileInfo;
-import com.youlai.system.service.OssService;
+import com.youlai.boot.infrastructure.file.service.FileService;
+import com.youlai.boot.system.model.dto.FileInfo;
 import io.minio.*;
 import io.minio.errors.*;
 import io.minio.http.Method;
@@ -36,7 +36,7 @@ import java.time.LocalDateTime;
 @ConfigurationProperties(prefix = "oss.minio")
 @RequiredArgsConstructor
 @Data
-public class MinioOssService implements OssService {
+public class MinioFileService implements FileService {
 
     /**
      * 服务Endpoint
@@ -102,7 +102,8 @@ public class MinioOssService implements OssService {
 
             // 返回文件路径
             String fileUrl;
-            if (StrUtil.isBlank(customDomain)) { // 未配置自定义域名
+            // 未配置自定义域名
+            if (StrUtil.isBlank(customDomain)) {
                 GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs.builder()
                         .bucket(bucketName).object(fileName)
                         .method(Method.GET)

src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java

@@ -1,16 +1,16 @@
-package com.youlai.boot.module.generator.controller;
+package com.youlai.boot.infrastructure.generator.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
 import com.youlai.boot.config.property.GeneratorProperties;
-import com.youlai.system.enums.LogModuleEnum;
-import com.youlai.boot.module.system.model.form.GenConfigForm;
-import com.youlai.boot.module.system.model.query.TablePageQuery;
-import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO;
-import com.youlai.boot.module.system.model.vo.TablePageVO;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.infrastructure.generator.service.GeneratorService;
+import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm;
+import com.youlai.boot.system.model.query.TablePageQuery;
+import com.youlai.boot.system.model.vo.GeneratorPreviewVO;
+import com.youlai.boot.system.model.vo.TablePageVO;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.system.service.GeneratorService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java

@@ -1,12 +1,12 @@
-package com.youlai.boot.module.generator.mapper;
+package com.youlai.boot.infrastructure.generator.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.bo.ColumnMetaData;
-import com.youlai.boot.module.system.model.bo.TableMetaData;
-import com.youlai.boot.module.system.model.entity.SysDept;
-import com.youlai.boot.module.system.model.query.TablePageQuery;
-import com.youlai.boot.module.system.model.vo.TablePageVO;
+import com.youlai.boot.system.model.bo.ColumnMetaData;
+import com.youlai.boot.system.model.bo.TableMetaData;
+import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.model.query.TablePageQuery;
+import com.youlai.boot.system.model.vo.TablePageVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.generator.mapper;
+package com.youlai.boot.infrastructure.generator.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.entity.GenConfig;
+import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.generator.mapper;
+package com.youlai.boot.infrastructure.generator.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.entity.GenFieldConfig;
+import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.infrastructure.generator.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
-import com.youlai.system.common.base.BaseEntity;
+import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java

@@ -1,13 +1,12 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.infrastructure.generator.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.youlai.system.common.base.BaseEntity;
-import com.youlai.system.enums.FormTypeEnum;
-import com.youlai.system.enums.QueryTypeEnum;
+import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.common.enums.FormTypeEnum;
+import com.youlai.boot.common.enums.QueryTypeEnum;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.system.model.form;
+package com.youlai.boot.infrastructure.generator.model.form;
 
-import com.youlai.system.enums.FormTypeEnum;
-import com.youlai.system.enums.QueryTypeEnum;
+import com.youlai.boot.common.enums.FormTypeEnum;
+import com.youlai.boot.common.enums.QueryTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.generator.service;
+package com.youlai.boot.infrastructure.generator.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.module.system.model.entity.GenConfig;
+import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
 
 /**
  * 代码生成配置接口

src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.generator.service;
+package com.youlai.boot.infrastructure.generator.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.module.system.model.entity.GenFieldConfig;
+import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
 
 /**
  * 代码生成配置接口

src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java

@@ -1,10 +1,10 @@
-package com.youlai.boot.module.generator.service;
+package com.youlai.boot.infrastructure.generator.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.form.GenConfigForm;
-import com.youlai.boot.module.system.model.query.TablePageQuery;
-import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO;
-import com.youlai.boot.module.system.model.vo.TablePageVO;
+import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm;
+import com.youlai.boot.system.model.query.TablePageQuery;
+import com.youlai.boot.system.model.vo.GeneratorPreviewVO;
+import com.youlai.boot.system.model.vo.TablePageVO;
 
 import java.util.List;
 

src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.module.generator.service.impl;
+package com.youlai.boot.infrastructure.generator.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.module.generator.mapper.GenConfigMapper;
-import com.youlai.boot.module.system.model.entity.GenConfig;
-import com.youlai.system.service.GenConfigService;
+import com.youlai.boot.infrastructure.generator.mapper.GenConfigMapper;
+import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
+import com.youlai.boot.infrastructure.generator.service.GenConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.module.generator.service.impl;
+package com.youlai.boot.infrastructure.generator.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.module.generator.mapper.GenFieldConfigMapper;
-import com.youlai.boot.module.system.model.entity.GenFieldConfig;
-import com.youlai.system.service.GenFieldConfigService;
+import com.youlai.boot.infrastructure.generator.mapper.GenFieldConfigMapper;
+import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
+import com.youlai.boot.infrastructure.generator.service.GenFieldConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.generator.service.impl;
+package com.youlai.boot.infrastructure.generator.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
@@ -11,26 +11,26 @@ import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.SystemApplication;
+import com.youlai.boot.YouLaiBootApplication;
+import com.youlai.boot.common.enums.FormTypeEnum;
+import com.youlai.boot.common.enums.JavaTypeEnum;
+import com.youlai.boot.common.enums.QueryTypeEnum;
 import com.youlai.boot.config.property.GeneratorProperties;
-import com.youlai.boot.module.system.converter.GenConfigConverter;
-import com.youlai.system.enums.FormTypeEnum;
-import com.youlai.system.enums.JavaTypeEnum;
-import com.youlai.system.enums.QueryTypeEnum;
+import com.youlai.boot.infrastructure.generator.service.GenConfigService;
+import com.youlai.boot.infrastructure.generator.service.GenFieldConfigService;
+import com.youlai.boot.infrastructure.generator.service.GeneratorService;
+import com.youlai.boot.system.converter.GenConfigConverter;
 import com.youlai.boot.common.exception.BusinessException;
-import com.youlai.boot.module.generator.mapper.DatabaseMapper;
-import com.youlai.boot.module.system.model.bo.ColumnMetaData;
-import com.youlai.boot.module.system.model.bo.TableMetaData;
-import com.youlai.boot.module.system.model.entity.GenConfig;
-import com.youlai.boot.module.system.model.entity.GenFieldConfig;
-import com.youlai.boot.module.system.model.form.GenConfigForm;
-import com.youlai.boot.module.system.model.query.TablePageQuery;
-import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO;
-import com.youlai.boot.module.system.model.vo.TablePageVO;
-import com.youlai.system.service.GeneratorService;
-import com.youlai.system.service.GenConfigService;
-import com.youlai.system.service.GenFieldConfigService;
-import com.youlai.system.service.SysMenuService;
+import com.youlai.boot.infrastructure.generator.mapper.DatabaseMapper;
+import com.youlai.boot.system.model.bo.ColumnMetaData;
+import com.youlai.boot.system.model.bo.TableMetaData;
+import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
+import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
+import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm;
+import com.youlai.boot.system.model.query.TablePageQuery;
+import com.youlai.boot.system.model.vo.GeneratorPreviewVO;
+import com.youlai.boot.system.model.vo.TablePageVO;
+import com.youlai.boot.system.service.SysMenuService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -112,7 +112,7 @@ public class GeneratorServiceImpl implements GeneratorService {
             String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0]));
             genConfig.setEntityName(entityName);
 
-            String packageName = SystemApplication.class.getPackageName();
+            String packageName = YouLaiBootApplication.class.getPackageName();
             genConfig.setPackageName(StrUtil.subBefore(packageName, ".", true));
             genConfig.setModuleName(StrUtil.subAfter(packageName, ".", true));
 

src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.service;
+package com.youlai.boot.infrastructure.mail.service;
 
 /**
  * 邮件服务接口层

src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.common.service.impl;
+package com.youlai.boot.infrastructure.mail.service.impl;
 
 import com.youlai.boot.config.property.MailProperties;
-import com.youlai.system.service.MailService;
+import com.youlai.boot.infrastructure.mail.service.MailService;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;

src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.service;
+package com.youlai.boot.infrastructure.sms.service;
 
 /**
  * 短信服务接口层

src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.service.impl;
+package com.youlai.boot.infrastructure.sms.service.impl;
 
 import com.aliyuncs.CommonRequest;
 import com.aliyuncs.CommonResponse;
@@ -9,7 +9,7 @@ import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.youlai.boot.config.property.AliyunSmsProperties;
-import com.youlai.system.service.SmsService;
+import com.youlai.boot.infrastructure.sms.service.SmsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/youlai/boot/system/controller/SysConfigController.java

@@ -1,12 +1,12 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.youlai.boot.common.result.PageResult;
 import com.youlai.boot.common.result.Result;
-import com.youlai.boot.module.system.model.form.ConfigForm;
-import com.youlai.boot.module.system.model.query.ConfigPageQuery;
-import com.youlai.boot.module.system.model.vo.ConfigVO;
-import com.youlai.boot.module.system.service.SysConfigService;
+import com.youlai.boot.system.model.form.ConfigForm;
+import com.youlai.boot.system.model.query.ConfigPageQuery;
+import com.youlai.boot.system.model.vo.ConfigVO;
+import com.youlai.boot.system.service.SysConfigService;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;

src/main/java/com/youlai/boot/system/controller/SysDeptController.java

@@ -1,14 +1,14 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
-import com.youlai.system.enums.LogModuleEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.annotation.NoRepeat;
-import com.youlai.system.common.model.Option;
-import com.youlai.system.common.result.Result;
-import com.youlai.boot.module.system.model.form.DeptForm;
-import com.youlai.boot.module.system.model.query.DeptQuery;
-import com.youlai.boot.module.system.model.vo.DeptVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.system.model.form.DeptForm;
+import com.youlai.boot.system.model.query.DeptQuery;
+import com.youlai.boot.system.model.vo.DeptVO;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.system.service.SysDeptService;
+import com.youlai.boot.system.service.SysDeptService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/youlai/boot/system/controller/SysDictController.java

@@ -1,16 +1,16 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.common.model.Option;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
-import com.youlai.system.enums.LogModuleEnum;
-import com.youlai.boot.module.system.model.query.DictPageQuery;
-import com.youlai.boot.module.system.model.vo.DictPageVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.vo.DictPageVO;
 import com.youlai.boot.common.annotation.NoRepeat;
-import com.youlai.boot.module.system.model.form.DictForm;
+import com.youlai.boot.system.model.form.DictForm;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.system.service.SysDictService;
+import com.youlai.boot.system.service.SysDictService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/youlai/boot/system/controller/SysLogController.java

@@ -1,13 +1,13 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
-import com.youlai.boot.module.system.model.query.LogPageQuery;
-import com.youlai.boot.module.system.model.vo.LogPageVO;
-import com.youlai.boot.module.system.model.vo.VisitStatsVO;
-import com.youlai.boot.module.system.model.vo.VisitTrendVO;
-import com.youlai.system.service.SysLogService;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.system.model.query.LogPageQuery;
+import com.youlai.boot.system.model.vo.LogPageVO;
+import com.youlai.boot.system.model.vo.VisitStatsVO;
+import com.youlai.boot.system.model.vo.VisitTrendVO;
+import com.youlai.boot.system.service.SysLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/system/controller/SysMenuController.java

@@ -1,16 +1,16 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
-import com.youlai.system.common.result.Result;
-import com.youlai.system.enums.LogModuleEnum;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.annotation.NoRepeat;
-import com.youlai.boot.module.system.model.form.MenuForm;
-import com.youlai.boot.module.system.model.query.MenuQuery;
-import com.youlai.boot.module.system.model.vo.MenuVO;
-import com.youlai.system.common.model.Option;
-import com.youlai.boot.module.system.model.vo.RouteVO;
+import com.youlai.boot.system.model.form.MenuForm;
+import com.youlai.boot.system.model.query.MenuQuery;
+import com.youlai.boot.system.model.vo.MenuVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.vo.RouteVO;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.boot.framework.security.util.SecurityUtils;
-import com.youlai.system.service.SysMenuService;
+import com.youlai.boot.core.security.util.SecurityUtils;
+import com.youlai.boot.system.service.SysMenuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/system/controller/SysRoleController.java

@@ -1,16 +1,16 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.enums.LogModuleEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.annotation.NoRepeat;
-import com.youlai.system.common.model.Option;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
-import com.youlai.boot.module.system.model.form.RoleForm;
-import com.youlai.boot.module.system.model.query.RolePageQuery;
-import com.youlai.boot.module.system.model.vo.RolePageVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.system.model.form.RoleForm;
+import com.youlai.boot.system.model.query.RolePageQuery;
+import com.youlai.boot.system.model.vo.RolePageVO;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.system.service.SysRoleService;
+import com.youlai.boot.system.service.SysRoleService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -1,28 +1,27 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.youlai.boot.module.system.model.form.*;
 import com.youlai.boot.system.model.form.*;
-import com.youlai.system.common.result.PageResult;
-import com.youlai.system.common.result.Result;
-import com.youlai.system.enums.ContactType;
-import com.youlai.boot.module.system.model.vo.UserProfileVO;
-import com.youlai.boot.framework.security.util.SecurityUtils;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.common.enums.ContactType;
+import com.youlai.boot.system.model.vo.UserProfileVO;
+import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.common.util.ExcelUtils;
-import com.youlai.system.enums.LogModuleEnum;
-import com.youlai.boot.module.system.model.dto.UserImportDTO;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.system.model.dto.UserImportDTO;
 import com.youlai.boot.common.annotation.NoRepeat;
-import com.youlai.boot.module.system.listener.UserImportListener;
-import com.youlai.boot.module.system.model.entity.SysUser;
-import com.youlai.boot.module.system.model.query.UserPageQuery;
-import com.youlai.boot.module.system.model.dto.UserExportDTO;
-import com.youlai.boot.module.system.model.vo.UserInfoVO;
-import com.youlai.boot.module.system.model.vo.UserPageVO;
+import com.youlai.boot.system.listener.UserImportListener;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.query.UserPageQuery;
+import com.youlai.boot.system.model.dto.UserExportDTO;
+import com.youlai.boot.system.model.vo.UserInfoVO;
+import com.youlai.boot.system.model.vo.UserPageVO;
 import com.youlai.boot.common.annotation.LogAnnotation;
-import com.youlai.system.service.SysUserService;
+import com.youlai.boot.system.service.SysUserService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/youlai/boot/system/controller/WebsocketController.java

@@ -1,6 +1,6 @@
-package com.youlai.boot.module.system.controller;
+package com.youlai.boot.system.controller;
 
-import com.youlai.boot.module.system.model.dto.ChatMessage;
+import com.youlai.boot.system.model.dto.ChatMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.handler.annotation.DestinationVariable;

src/main/java/com/youlai/boot/system/converter/ConfigConverter.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.entity.SysConfig;
-import com.youlai.boot.module.system.model.vo.ConfigVO;
-import com.youlai.boot.module.system.model.form.ConfigForm;
+import com.youlai.boot.system.model.entity.SysConfig;
+import com.youlai.boot.system.model.vo.ConfigVO;
+import com.youlai.boot.system.model.form.ConfigForm;
 import org.mapstruct.Mapper;
 
 /**

src/main/java/com/youlai/boot/system/converter/DeptConverter.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
-import com.youlai.boot.module.system.model.entity.SysDept;
-import com.youlai.boot.module.system.model.vo.DeptVO;
-import com.youlai.boot.module.system.model.form.DeptForm;
+import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.model.vo.DeptVO;
+import com.youlai.boot.system.model.form.DeptForm;
 import org.mapstruct.Mapper;
 
 /**

src/main/java/com/youlai/boot/system/converter/DictConverter.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.entity.SysDict;
-import com.youlai.boot.module.system.model.vo.DictPageVO;
-import com.youlai.boot.module.system.model.form.DictForm;
+import com.youlai.boot.system.model.entity.SysDict;
+import com.youlai.boot.system.model.vo.DictPageVO;
+import com.youlai.boot.system.model.form.DictForm;
 import org.mapstruct.Mapper;
 
 /**

src/main/java/com/youlai/boot/system/converter/DictItemConverter.java

@@ -1,10 +1,10 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.entity.SysDictItem;
-import com.youlai.boot.module.system.model.vo.DictPageVO;
-import com.youlai.system.common.model.Option;
-import com.youlai.boot.module.system.model.form.DictForm;
+import com.youlai.boot.system.model.entity.SysDictItem;
+import com.youlai.boot.system.model.vo.DictPageVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.form.DictForm;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;

src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
-import com.youlai.boot.module.system.model.entity.GenConfig;
-import com.youlai.boot.module.system.model.entity.GenFieldConfig;
-import com.youlai.boot.module.system.model.form.GenConfigForm;
+import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
+import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
+import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 

src/main/java/com/youlai/boot/system/converter/MenuConverter.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
-import com.youlai.boot.module.system.model.entity.SysMenu;
-import com.youlai.boot.module.system.model.vo.MenuVO;
-import com.youlai.boot.module.system.model.form.MenuForm;
+import com.youlai.boot.system.model.entity.SysMenu;
+import com.youlai.boot.system.model.vo.MenuVO;
+import com.youlai.boot.system.model.form.MenuForm;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 

src/main/java/com/youlai/boot/system/converter/RoleConverter.java

@@ -1,10 +1,10 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.entity.SysRole;
-import com.youlai.boot.module.system.model.vo.RolePageVO;
-import com.youlai.system.common.model.Option;
-import com.youlai.boot.module.system.model.form.RoleForm;
+import com.youlai.boot.system.model.entity.SysRole;
+import com.youlai.boot.system.model.vo.RolePageVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.form.RoleForm;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;

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

@@ -1,14 +1,14 @@
-package com.youlai.boot.module.system.converter;
+package com.youlai.boot.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.entity.SysUser;
-import com.youlai.boot.module.system.model.vo.UserInfoVO;
-import com.youlai.boot.module.system.model.vo.UserPageVO;
-import com.youlai.boot.module.system.model.vo.UserProfileVO;
-import com.youlai.boot.module.system.model.bo.UserBO;
-import com.youlai.boot.module.system.model.form.UserForm;
-import com.youlai.boot.module.system.model.dto.UserImportDTO;
-import com.youlai.boot.module.system.model.form.UserProfileForm;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.vo.UserInfoVO;
+import com.youlai.boot.system.model.vo.UserPageVO;
+import com.youlai.boot.system.model.vo.UserProfileVO;
+import com.youlai.boot.system.model.bo.UserBO;
+import com.youlai.boot.system.model.form.UserForm;
+import com.youlai.boot.system.model.dto.UserImportDTO;
+import com.youlai.boot.system.model.form.UserProfileForm;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.event;
+package com.youlai.boot.system.event;
 
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;

src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.handler;
+package com.youlai.boot.system.handler;
 
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/boot/system/listener/UserImportListener.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.listener;
+package com.youlai.boot.system.listener;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Validator;
@@ -8,20 +8,20 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.youlai.boot.common.base.BaseAnalysisEventListener;
-import com.youlai.boot.module.system.model.entity.SysDept;
-import com.youlai.boot.module.system.model.entity.SysRole;
-import com.youlai.boot.module.system.model.entity.SysUser;
-import com.youlai.boot.module.system.model.entity.SysUserRole;
-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.boot.module.system.converter.UserConverter;
-import com.youlai.boot.module.system.model.dto.UserImportDTO;
-import com.youlai.system.service.SysDeptService;
-import com.youlai.system.service.SysRoleService;
-import com.youlai.system.service.SysUserRoleService;
-import com.youlai.system.service.SysUserService;
+import com.youlai.boot.system.model.entity.SysDept;
+import com.youlai.boot.system.model.entity.SysRole;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.entity.SysUserRole;
+import com.youlai.boot.common.base.IBaseEnum;
+import com.youlai.boot.common.constant.SystemConstants;
+import com.youlai.boot.common.enums.GenderEnum;
+import com.youlai.boot.common.enums.StatusEnum;
+import com.youlai.boot.system.converter.UserConverter;
+import com.youlai.boot.system.model.dto.UserImportDTO;
+import com.youlai.boot.system.service.SysDeptService;
+import com.youlai.boot.system.service.SysRoleService;
+import com.youlai.boot.system.service.SysUserRoleService;
+import com.youlai.boot.system.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
 

src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.entity.SysConfig;
+import com.youlai.boot.system.model.entity.SysConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -1,10 +1,10 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.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.boot.common.annotation.DataPermission;
-import com.youlai.boot.module.system.model.entity.SysDept;
+import com.youlai.boot.system.model.entity.SysDept;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.entity.SysDictItem;
+import com.youlai.boot.system.model.entity.SysDictItem;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java

@@ -1,10 +1,10 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.entity.SysDict;
-import com.youlai.boot.module.system.model.query.DictPageQuery;
-import com.youlai.boot.module.system.model.vo.DictPageVO;
+import com.youlai.boot.system.model.entity.SysDict;
+import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.vo.DictPageVO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java

@@ -1,11 +1,11 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.bo.VisitCount;
-import com.youlai.boot.module.system.model.entity.SysLog;
-import com.youlai.boot.module.system.model.query.LogPageQuery;
-import com.youlai.boot.module.system.model.vo.LogPageVO;
-import com.youlai.boot.module.system.model.vo.VisitStatsVO;
+import com.youlai.boot.system.model.bo.VisitCount;
+import com.youlai.boot.system.model.entity.SysLog;
+import com.youlai.boot.system.model.query.LogPageQuery;
+import com.youlai.boot.system.model.vo.LogPageVO;
+import com.youlai.boot.system.model.vo.VisitStatsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.bo.RouteBO;
-import com.youlai.boot.module.system.model.entity.SysMenu;
+import com.youlai.boot.system.model.bo.RouteBO;
+import com.youlai.boot.system.model.entity.SysMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.entity.SysRole;
+import com.youlai.boot.system.model.entity.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Set;

src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.bo.RolePermsBO;
-import com.youlai.boot.module.system.model.entity.SysRoleMenu;
+import com.youlai.boot.system.model.bo.RolePermsBO;
+import com.youlai.boot.system.model.entity.SysRoleMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,14 +1,14 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.module.system.model.bo.UserBO;
-import com.youlai.boot.module.system.model.entity.SysUser;
-import com.youlai.boot.module.system.model.query.UserPageQuery;
-import com.youlai.boot.module.system.model.form.UserForm;
+import com.youlai.boot.system.model.bo.UserBO;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.query.UserPageQuery;
+import com.youlai.boot.system.model.form.UserForm;
 import com.youlai.boot.common.annotation.DataPermission;
-import com.youlai.boot.module.system.model.dto.UserAuthInfo;
-import com.youlai.boot.module.system.model.dto.UserExportDTO;
+import com.youlai.boot.system.model.dto.UserAuthInfo;
+import com.youlai.boot.system.model.dto.UserExportDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.module.system.mapper;
+package com.youlai.boot.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.module.system.model.entity.SysUserRole;
+import com.youlai.boot.system.model.entity.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.bo;
+package com.youlai.boot.system.model.bo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

src/main/java/com/youlai/boot/system/model/bo/RolePermsBO.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.bo;
+package com.youlai.boot.system.model.bo;
 
 import lombok.Data;
 

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

@@ -1,6 +1,6 @@
-package com.youlai.boot.module.system.model.bo;
+package com.youlai.boot.system.model.bo;
 
-import com.youlai.system.enums.MenuTypeEnum;
+import com.youlai.boot.common.enums.MenuTypeEnum;
 import lombok.Data;
 
 /**

src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.bo;
+package com.youlai.boot.system.model.bo;
 
 import lombok.Data;
 

src/main/java/com/youlai/boot/system/model/bo/UserBO.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.bo;
+package com.youlai.boot.system.model.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/com/youlai/boot/system/model/bo/VisitCount.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.bo;
+package com.youlai.boot.system.model.bo;
 
 import lombok.Data;
 

src/main/java/com/youlai/boot/system/model/dto/CaptchaResult.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

src/main/java/com/youlai/boot/system/model/dto/ChatMessage.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/youlai/boot/system/model/dto/FileInfo.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

src/main/java/com/youlai/boot/system/model/dto/LoginResult.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;

src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import lombok.Data;
 

src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;

src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.dto;
+package com.youlai.boot.system.model.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

src/main/java/com/youlai/boot/system/model/entity/SysConfig.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.youlai.boot.common.base.BaseEntity;

src/main/java/com/youlai/boot/system/model/entity/SysDept.java

@@ -1,6 +1,6 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
-import com.youlai.system.common.base.BaseEntity;
+import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/system/model/entity/SysDict.java

@@ -1,6 +1,6 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
-import com.youlai.system.common.base.BaseEntity;
+import com.youlai.boot.common.base.BaseEntity;
 import lombok.Data;
 
 /**

src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/youlai/boot/system/model/entity/SysLog.java

@@ -1,11 +1,11 @@
-package com.youlai.boot.module.system.model.entity;
+package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import com.youlai.system.enums.LogModuleEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
 import lombok.Data;
 
 /**