From f32996d9c26f1b55d7312c226ba7b6dff8eef7c3 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Thu, 26 Feb 2026 18:53:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97=E5=B9=B6=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E8=87=B3infra=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- sql/mysql/youlai_admin.sql | 2 +- .../auth/service/impl/AuthServiceImpl.java | 5 ++-- .../youlai/boot/config/WebSocketConfig.java | 2 +- .../codegen/controller/CodegenController.java | 14 +++++----- .../codegen/converter/CodegenConverter.java | 8 +++--- .../codegen/enums/FormTypeEnum.java | 2 +- .../codegen/enums/JavaTypeEnum.java | 2 +- .../codegen/enums/QueryTypeEnum.java | 2 +- .../codegen/mapper/DatabaseMapper.java | 10 +++---- .../codegen/mapper/GenTableColumnMapper.java | 4 +-- .../codegen/mapper/GenTableMapper.java | 4 +-- .../codegen/model/bo/ColumnMetaData.java | 2 +- .../codegen/model/bo/TableMetaData.java | 2 +- .../codegen/model/entity/GenTable.java | 2 +- .../codegen/model/entity/GenTableColumn.java | 6 ++-- .../codegen/model/form/GenConfigForm.java | 6 ++-- .../codegen/model/query/TablePageQuery.java | 2 +- .../codegen/model/query/TableQuery.java | 2 +- .../codegen/model/vo/CodegenPreviewVO.java | 2 +- .../codegen/model/vo/TablePageVO.java | 2 +- .../codegen/service/CodegenService.java | 8 +++--- .../service/GenTableColumnService.java | 4 +-- .../codegen/service/GenTableService.java | 6 ++-- .../service/impl/CodegenServiceImpl.java | 22 +++++++-------- .../impl/GenTableColumnServiceImpl.java | 8 +++--- .../service/impl/GenTableServiceImpl.java | 28 +++++++++---------- .../file/controller/FileController.java | 6 ++-- .../file/model/FileInfo.java | 2 +- .../file/service/FileService.java | 4 +-- .../file/service/impl/AliyunFileService.java | 6 ++-- .../file/service/impl/LocalFileService.java | 6 ++-- .../file/service/impl/MinioFileService.java | 6 ++-- .../mail/controller/MailController.java | 2 +- .../mail/service/MailService.java | 2 +- .../mail/service/impl/MailServiceImpl.java | 4 +-- .../sms/controller/SmsController.java | 2 +- .../sms/enums/SmsTypeEnum.java | 2 +- .../sms/service/SmsService.java | 4 +-- .../sms/service/impl/AliyunSmsService.java | 6 ++-- .../websocket/dto/DictChangeEvent.java | 2 +- .../websocket/dto/OnlineUserDTO.java | 2 +- .../websocket/job/OnlineUserCountJob.java | 8 +++--- .../publisher/WebSocketPublisher.java | 2 +- .../websocket/service/WebSocketService.java | 4 +-- .../service/impl/WebSocketServiceImpl.java | 14 +++++----- .../session/UserSessionRegistry.java | 4 +-- .../websocket/topic/WebSocketTopics.java | 2 +- .../system/controller/DictController.java | 2 +- .../boot/system/service/MenuService.java | 3 +- .../system/service/impl/MenuServiceImpl.java | 4 +-- .../service/impl/NoticeServiceImpl.java | 4 +-- .../system/service/impl/UserServiceImpl.java | 8 ++---- .../mapper/codegen/DatabaseMapper.xml | 6 ++-- .../boot/generator/SystemCodeGenerator.java | 4 +-- 55 files changed, 138 insertions(+), 142 deletions(-) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/controller/CodegenController.java (91%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/converter/CodegenConverter.java (84%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/enums/FormTypeEnum.java (97%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/enums/JavaTypeEnum.java (98%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/enums/QueryTypeEnum.java (96%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/mapper/DatabaseMapper.java (72%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/mapper/GenTableColumnMapper.java (70%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/mapper/GenTableMapper.java (69%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/bo/ColumnMetaData.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/bo/TableMetaData.java (91%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/entity/GenTable.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/entity/GenTableColumn.java (90%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/form/GenConfigForm.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/query/TablePageQuery.java (91%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/query/TableQuery.java (91%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/vo/CodegenPreviewVO.java (92%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/model/vo/TablePageVO.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/service/CodegenService.java (75%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/service/GenTableColumnService.java (63%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/service/GenTableService.java (78%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/service/impl/CodegenServiceImpl.java (95%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/service/impl/GenTableColumnServiceImpl.java (61%) rename src/main/java/com/youlai/boot/{platform => infra}/codegen/service/impl/GenTableServiceImpl.java (90%) rename src/main/java/com/youlai/boot/{platform => infra}/file/controller/FileController.java (90%) rename src/main/java/com/youlai/boot/{platform => infra}/file/model/FileInfo.java (88%) rename src/main/java/com/youlai/boot/{platform => infra}/file/service/FileService.java (82%) rename src/main/java/com/youlai/boot/{platform => infra}/file/service/impl/AliyunFileService.java (95%) rename src/main/java/com/youlai/boot/{platform => infra}/file/service/impl/LocalFileService.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/file/service/impl/MinioFileService.java (97%) rename src/main/java/com/youlai/boot/{platform => infra}/mail/controller/MailController.java (76%) rename src/main/java/com/youlai/boot/{platform => infra}/mail/service/MailService.java (92%) rename src/main/java/com/youlai/boot/{platform => infra}/mail/service/impl/MailServiceImpl.java (95%) rename src/main/java/com/youlai/boot/{platform => infra}/sms/controller/SmsController.java (66%) rename src/main/java/com/youlai/boot/{platform => infra}/sms/enums/SmsTypeEnum.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/sms/service/SmsService.java (85%) rename src/main/java/com/youlai/boot/{platform => infra}/sms/service/impl/AliyunSmsService.java (94%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/dto/DictChangeEvent.java (95%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/dto/OnlineUserDTO.java (93%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/job/OnlineUserCountJob.java (83%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/publisher/WebSocketPublisher.java (97%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/service/WebSocketService.java (90%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/service/impl/WebSocketServiceImpl.java (93%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/session/UserSessionRegistry.java (97%) rename src/main/java/com/youlai/boot/{platform => infra}/websocket/topic/WebSocketTopics.java (89%) diff --git a/README.md b/README.md index 01c5e795..e7d1096e 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ youlai-boot │ │ ├── filter # 过滤器(请求日志、限流) │ │ ├── validator # 验证器 │ │ └── web # Web响应封装(Result、PageResult等) -│ ├── platform # 平台服务（通用服务） +│ ├── infra # 基础服务 │ │ ├── codegen # 代码生成模块 │ │ ├── file # 文件服务 │ │ ├── mail # 邮件服务 diff --git a/sql/mysql/youlai_admin.sql b/sql/mysql/youlai_admin.sql index 373aa23d..1d7ce941 100644 --- a/sql/mysql/youlai_admin.sql +++ b/sql/mysql/youlai_admin.sql @@ -540,7 +540,7 @@ CREATE TABLE `sys_user_notice` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', `notice_id` bigint NOT NULL COMMENT '公共通知id', `user_id` bigint NOT NULL COMMENT '用户id', - `is_read` bigint DEFAULT '0' COMMENT '读取状态（0: 未读, 1: 已读）', + `is_read` tinyint DEFAULT '0' COMMENT '读取状态（0: 未读, 1: 已读）', `read_time` datetime COMMENT '阅读时间', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime COMMENT '更新时间', diff --git a/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java index 44ad2260..da3c2ce9 100644 --- a/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java @@ -8,11 +8,10 @@ import cn.hutool.core.util.StrUtil; import com.youlai.boot.auth.model.vo.CaptchaVO; import com.youlai.boot.auth.service.AuthService; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.enums.CaptchaTypeEnum; import com.youlai.boot.config.property.CaptchaProperties; -import com.youlai.boot.platform.sms.enums.SmsTypeEnum; -import com.youlai.boot.platform.sms.service.SmsService; +import com.youlai.boot.infra.sms.enums.SmsTypeEnum; +import com.youlai.boot.infra.sms.service.SmsService; import com.youlai.boot.security.model.AuthenticationToken; import com.youlai.boot.security.model.SmsAuthenticationToken; import com.youlai.boot.security.token.TokenManager; diff --git a/src/main/java/com/youlai/boot/config/WebSocketConfig.java b/src/main/java/com/youlai/boot/config/WebSocketConfig.java index 89d4a104..cffeea75 100644 --- a/src/main/java/com/youlai/boot/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/boot/config/WebSocketConfig.java @@ -3,7 +3,7 @@ package com.youlai.boot.config; import cn.hutool.core.util.StrUtil; import com.youlai.boot.security.model.SysUserDetails; import com.youlai.boot.security.token.TokenManager; -import com.youlai.boot.platform.websocket.service.WebSocketService; +import com.youlai.boot.infra.websocket.service.WebSocketService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/infra/codegen/controller/CodegenController.java similarity index 91% rename from src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java rename to src/main/java/com/youlai/boot/infra/codegen/controller/CodegenController.java index 1f483e60..72647041 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/infra/codegen/controller/CodegenController.java @@ -1,17 +1,17 @@ -package com.youlai.boot.platform.codegen.controller; +package com.youlai.boot.infra.codegen.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.core.web.PageResult; import com.youlai.boot.core.web.Result; import com.youlai.boot.config.property.CodegenProperties; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.platform.codegen.service.CodegenService; -import com.youlai.boot.platform.codegen.model.form.GenConfigForm; -import com.youlai.boot.platform.codegen.model.query.TableQuery; -import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.platform.codegen.model.vo.TablePageVO; +import com.youlai.boot.infra.codegen.service.CodegenService; +import com.youlai.boot.infra.codegen.model.form.GenConfigForm; +import com.youlai.boot.infra.codegen.model.query.TableQuery; +import com.youlai.boot.infra.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.infra.codegen.model.vo.TablePageVO; import com.youlai.boot.common.annotation.Log; -import com.youlai.boot.platform.codegen.service.GenTableService; +import com.youlai.boot.infra.codegen.service.GenTableService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/platform/codegen/converter/CodegenConverter.java b/src/main/java/com/youlai/boot/infra/codegen/converter/CodegenConverter.java similarity index 84% rename from src/main/java/com/youlai/boot/platform/codegen/converter/CodegenConverter.java rename to src/main/java/com/youlai/boot/infra/codegen/converter/CodegenConverter.java index 4e9be4b9..9bf2b2ca 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/converter/CodegenConverter.java +++ b/src/main/java/com/youlai/boot/infra/codegen/converter/CodegenConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.platform.codegen.converter; +package com.youlai.boot.infra.codegen.converter; -import com.youlai.boot.platform.codegen.model.entity.GenTable; -import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; -import com.youlai.boot.platform.codegen.model.form.GenConfigForm; +import com.youlai.boot.infra.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.entity.GenTableColumn; +import com.youlai.boot.infra.codegen.model.form.GenConfigForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/platform/codegen/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/infra/codegen/enums/FormTypeEnum.java similarity index 97% rename from src/main/java/com/youlai/boot/platform/codegen/enums/FormTypeEnum.java rename to src/main/java/com/youlai/boot/infra/codegen/enums/FormTypeEnum.java index 34bcbd6e..457c129d 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/infra/codegen/enums/FormTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.enums; +package com.youlai.boot.infra.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/platform/codegen/enums/JavaTypeEnum.java b/src/main/java/com/youlai/boot/infra/codegen/enums/JavaTypeEnum.java similarity index 98% rename from src/main/java/com/youlai/boot/platform/codegen/enums/JavaTypeEnum.java rename to src/main/java/com/youlai/boot/infra/codegen/enums/JavaTypeEnum.java index 7474abb8..5077cbe1 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/enums/JavaTypeEnum.java +++ b/src/main/java/com/youlai/boot/infra/codegen/enums/JavaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.enums; +package com.youlai.boot.infra.codegen.enums; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/platform/codegen/enums/QueryTypeEnum.java b/src/main/java/com/youlai/boot/infra/codegen/enums/QueryTypeEnum.java similarity index 96% rename from src/main/java/com/youlai/boot/platform/codegen/enums/QueryTypeEnum.java rename to src/main/java/com/youlai/boot/infra/codegen/enums/QueryTypeEnum.java index 7c0469d0..ffb71c44 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/infra/codegen/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.enums; +package com.youlai.boot.infra.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/infra/codegen/mapper/DatabaseMapper.java similarity index 72% rename from src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/infra/codegen/mapper/DatabaseMapper.java index c62c79c2..0d77ae13 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/infra/codegen/mapper/DatabaseMapper.java @@ -1,11 +1,11 @@ -package com.youlai.boot.platform.codegen.mapper; +package com.youlai.boot.infra.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.platform.codegen.model.bo.TableMetaData; -import com.youlai.boot.platform.codegen.model.query.TableQuery; -import com.youlai.boot.platform.codegen.model.vo.TablePageVO; +import com.youlai.boot.infra.codegen.model.bo.ColumnMetaData; +import com.youlai.boot.infra.codegen.model.bo.TableMetaData; +import com.youlai.boot.infra.codegen.model.query.TableQuery; +import com.youlai.boot.infra.codegen.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/platform/codegen/mapper/GenTableColumnMapper.java b/src/main/java/com/youlai/boot/infra/codegen/mapper/GenTableColumnMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/platform/codegen/mapper/GenTableColumnMapper.java rename to src/main/java/com/youlai/boot/infra/codegen/mapper/GenTableColumnMapper.java index de7728e1..6be74910 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/mapper/GenTableColumnMapper.java +++ b/src/main/java/com/youlai/boot/infra/codegen/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.platform.codegen.mapper; +package com.youlai.boot.infra.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; +import com.youlai.boot.infra.codegen.model.entity.GenTableColumn; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/platform/codegen/mapper/GenTableMapper.java b/src/main/java/com/youlai/boot/infra/codegen/mapper/GenTableMapper.java similarity index 69% rename from src/main/java/com/youlai/boot/platform/codegen/mapper/GenTableMapper.java rename to src/main/java/com/youlai/boot/infra/codegen/mapper/GenTableMapper.java index d7d2e750..0c896e7e 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/mapper/GenTableMapper.java +++ b/src/main/java/com/youlai/boot/infra/codegen/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.platform.codegen.mapper; +package com.youlai.boot.infra.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.platform.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.entity.GenTable; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/infra/codegen/model/bo/ColumnMetaData.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/codegen/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/infra/codegen/model/bo/ColumnMetaData.java index 835ab048..da77910c 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.bo; +package com.youlai.boot.infra.codegen.model.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/infra/codegen/model/bo/TableMetaData.java similarity index 91% rename from src/main/java/com/youlai/boot/platform/codegen/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/infra/codegen/model/bo/TableMetaData.java index a741ba49..a91672db 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.bo; +package com.youlai.boot.infra.codegen.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenTable.java b/src/main/java/com/youlai/boot/infra/codegen/model/entity/GenTable.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/codegen/model/entity/GenTable.java rename to src/main/java/com/youlai/boot/infra/codegen/model/entity/GenTable.java index 45d30606..8efcaa4a 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenTable.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.entity; +package com.youlai.boot.infra.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenTableColumn.java b/src/main/java/com/youlai/boot/infra/codegen/model/entity/GenTableColumn.java similarity index 90% rename from src/main/java/com/youlai/boot/platform/codegen/model/entity/GenTableColumn.java rename to src/main/java/com/youlai/boot/infra/codegen/model/entity/GenTableColumn.java index 837bbc50..3dd3ef59 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/entity/GenTableColumn.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/entity/GenTableColumn.java @@ -1,12 +1,12 @@ -package com.youlai.boot.platform.codegen.model.entity; +package com.youlai.boot.infra.codegen.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BaseEntity; -import com.youlai.boot.platform.codegen.enums.FormTypeEnum; -import com.youlai.boot.platform.codegen.enums.QueryTypeEnum; +import com.youlai.boot.infra.codegen.enums.FormTypeEnum; +import com.youlai.boot.infra.codegen.enums.QueryTypeEnum; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/infra/codegen/model/form/GenConfigForm.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/codegen/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/infra/codegen/model/form/GenConfigForm.java index cf5d22ec..027ee957 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/form/GenConfigForm.java @@ -1,7 +1,7 @@ -package com.youlai.boot.platform.codegen.model.form; +package com.youlai.boot.infra.codegen.model.form; -import com.youlai.boot.platform.codegen.enums.FormTypeEnum; -import com.youlai.boot.platform.codegen.enums.QueryTypeEnum; +import com.youlai.boot.infra.codegen.enums.FormTypeEnum; +import com.youlai.boot.infra.codegen.enums.QueryTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/infra/codegen/model/query/TablePageQuery.java similarity index 91% rename from src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/infra/codegen/model/query/TablePageQuery.java index b9895385..73d5ec10 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/query/TablePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.query; +package com.youlai.boot.infra.codegen.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BaseQuery; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/query/TableQuery.java b/src/main/java/com/youlai/boot/infra/codegen/model/query/TableQuery.java similarity index 91% rename from src/main/java/com/youlai/boot/platform/codegen/model/query/TableQuery.java rename to src/main/java/com/youlai/boot/infra/codegen/model/query/TableQuery.java index 443efab6..0c9eaf62 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/query/TableQuery.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/query/TableQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.query; +package com.youlai.boot.infra.codegen.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BaseQuery; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java b/src/main/java/com/youlai/boot/infra/codegen/model/vo/CodegenPreviewVO.java similarity index 92% rename from src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java rename to src/main/java/com/youlai/boot/infra/codegen/model/vo/CodegenPreviewVO.java index 18d1def3..600380bc 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/vo/CodegenPreviewVO.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/vo/CodegenPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.vo; +package com.youlai.boot.infra.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/infra/codegen/model/vo/TablePageVO.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/infra/codegen/model/vo/TablePageVO.java index 0b011181..2f049e80 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/infra/codegen/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.model.vo; +package com.youlai.boot.infra.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java b/src/main/java/com/youlai/boot/infra/codegen/service/CodegenService.java similarity index 75% rename from src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java rename to src/main/java/com/youlai/boot/infra/codegen/service/CodegenService.java index 8a028158..29b3c055 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/CodegenService.java +++ b/src/main/java/com/youlai/boot/infra/codegen/service/CodegenService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.platform.codegen.service; +package com.youlai.boot.infra.codegen.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.platform.codegen.model.query.TableQuery; -import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.platform.codegen.model.vo.TablePageVO; +import com.youlai.boot.infra.codegen.model.query.TableQuery; +import com.youlai.boot.infra.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.infra.codegen.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/GenTableColumnService.java b/src/main/java/com/youlai/boot/infra/codegen/service/GenTableColumnService.java similarity index 63% rename from src/main/java/com/youlai/boot/platform/codegen/service/GenTableColumnService.java rename to src/main/java/com/youlai/boot/infra/codegen/service/GenTableColumnService.java index 11e9ad61..cc937322 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/GenTableColumnService.java +++ b/src/main/java/com/youlai/boot/infra/codegen/service/GenTableColumnService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.platform.codegen.service; +package com.youlai.boot.infra.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; +import com.youlai.boot.infra.codegen.model.entity.GenTableColumn; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/GenTableService.java b/src/main/java/com/youlai/boot/infra/codegen/service/GenTableService.java similarity index 78% rename from src/main/java/com/youlai/boot/platform/codegen/service/GenTableService.java rename to src/main/java/com/youlai/boot/infra/codegen/service/GenTableService.java index 135c0c3e..d06aff62 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/GenTableService.java +++ b/src/main/java/com/youlai/boot/infra/codegen/service/GenTableService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.platform.codegen.service; +package com.youlai.boot.infra.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.platform.codegen.model.entity.GenTable; -import com.youlai.boot.platform.codegen.model.form.GenConfigForm; +import com.youlai.boot.infra.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.form.GenConfigForm; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/infra/codegen/service/impl/CodegenServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java rename to src/main/java/com/youlai/boot/infra/codegen/service/impl/CodegenServiceImpl.java index 0161033b..309c9386 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/infra/codegen/service/impl/CodegenServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.service.impl; +package com.youlai.boot.infra.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -11,18 +11,18 @@ 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.boot.platform.codegen.enums.JavaTypeEnum; +import com.youlai.boot.infra.codegen.enums.JavaTypeEnum; import com.youlai.boot.config.property.CodegenProperties; -import com.youlai.boot.platform.codegen.service.GenTableService; -import com.youlai.boot.platform.codegen.service.GenTableColumnService; -import com.youlai.boot.platform.codegen.service.CodegenService; +import com.youlai.boot.infra.codegen.service.GenTableService; +import com.youlai.boot.infra.codegen.service.GenTableColumnService; +import com.youlai.boot.infra.codegen.service.CodegenService; import com.youlai.boot.core.exception.BusinessException; -import com.youlai.boot.platform.codegen.mapper.DatabaseMapper; -import com.youlai.boot.platform.codegen.model.entity.GenTable; -import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; -import com.youlai.boot.platform.codegen.model.query.TableQuery; -import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.platform.codegen.model.vo.TablePageVO; +import com.youlai.boot.infra.codegen.mapper.DatabaseMapper; +import com.youlai.boot.infra.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.entity.GenTableColumn; +import com.youlai.boot.infra.codegen.model.query.TableQuery; +import com.youlai.boot.infra.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.infra.codegen.model.vo.TablePageVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenTableColumnServiceImpl.java b/src/main/java/com/youlai/boot/infra/codegen/service/impl/GenTableColumnServiceImpl.java similarity index 61% rename from src/main/java/com/youlai/boot/platform/codegen/service/impl/GenTableColumnServiceImpl.java rename to src/main/java/com/youlai/boot/infra/codegen/service/impl/GenTableColumnServiceImpl.java index d74c0e57..5259c0f0 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenTableColumnServiceImpl.java +++ b/src/main/java/com/youlai/boot/infra/codegen/service/impl/GenTableColumnServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.platform.codegen.service.impl; +package com.youlai.boot.infra.codegen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.platform.codegen.mapper.GenTableColumnMapper; -import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; -import com.youlai.boot.platform.codegen.service.GenTableColumnService; +import com.youlai.boot.infra.codegen.mapper.GenTableColumnMapper; +import com.youlai.boot.infra.codegen.model.entity.GenTableColumn; +import com.youlai.boot.infra.codegen.service.GenTableColumnService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenTableServiceImpl.java b/src/main/java/com/youlai/boot/infra/codegen/service/impl/GenTableServiceImpl.java similarity index 90% rename from src/main/java/com/youlai/boot/platform/codegen/service/impl/GenTableServiceImpl.java rename to src/main/java/com/youlai/boot/infra/codegen/service/impl/GenTableServiceImpl.java index c0bd7ebb..88374059 100644 --- a/src/main/java/com/youlai/boot/platform/codegen/service/impl/GenTableServiceImpl.java +++ b/src/main/java/com/youlai/boot/infra/codegen/service/impl/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.codegen.service.impl; +package com.youlai.boot.infra.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -7,21 +7,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.YouLaiBootApplication; import com.youlai.boot.common.enums.EnvEnum; -import com.youlai.boot.platform.codegen.enums.FormTypeEnum; -import com.youlai.boot.platform.codegen.enums.JavaTypeEnum; -import com.youlai.boot.platform.codegen.enums.QueryTypeEnum; +import com.youlai.boot.infra.codegen.enums.FormTypeEnum; +import com.youlai.boot.infra.codegen.enums.JavaTypeEnum; +import com.youlai.boot.infra.codegen.enums.QueryTypeEnum; import com.youlai.boot.core.exception.BusinessException; import com.youlai.boot.config.property.CodegenProperties; -import com.youlai.boot.platform.codegen.converter.CodegenConverter; -import com.youlai.boot.platform.codegen.mapper.DatabaseMapper; -import com.youlai.boot.platform.codegen.mapper.GenTableMapper; -import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.platform.codegen.model.bo.TableMetaData; -import com.youlai.boot.platform.codegen.model.entity.GenTable; -import com.youlai.boot.platform.codegen.model.entity.GenTableColumn; -import com.youlai.boot.platform.codegen.model.form.GenConfigForm; -import com.youlai.boot.platform.codegen.service.GenTableService; -import com.youlai.boot.platform.codegen.service.GenTableColumnService; +import com.youlai.boot.infra.codegen.converter.CodegenConverter; +import com.youlai.boot.infra.codegen.mapper.DatabaseMapper; +import com.youlai.boot.infra.codegen.mapper.GenTableMapper; +import com.youlai.boot.infra.codegen.model.bo.ColumnMetaData; +import com.youlai.boot.infra.codegen.model.bo.TableMetaData; +import com.youlai.boot.infra.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.entity.GenTableColumn; +import com.youlai.boot.infra.codegen.model.form.GenConfigForm; +import com.youlai.boot.infra.codegen.service.GenTableService; +import com.youlai.boot.infra.codegen.service.GenTableColumnService; import com.youlai.boot.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/youlai/boot/platform/file/controller/FileController.java b/src/main/java/com/youlai/boot/infra/file/controller/FileController.java similarity index 90% rename from src/main/java/com/youlai/boot/platform/file/controller/FileController.java rename to src/main/java/com/youlai/boot/infra/file/controller/FileController.java index 55923b2a..227be1e0 100644 --- a/src/main/java/com/youlai/boot/platform/file/controller/FileController.java +++ b/src/main/java/com/youlai/boot/infra/file/controller/FileController.java @@ -1,8 +1,8 @@ -package com.youlai.boot.platform.file.controller; +package com.youlai.boot.infra.file.controller; import com.youlai.boot.core.web.Result; -import com.youlai.boot.platform.file.service.FileService; -import com.youlai.boot.platform.file.model.FileInfo; +import com.youlai.boot.infra.file.service.FileService; +import com.youlai.boot.infra.file.model.FileInfo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/platform/file/model/FileInfo.java b/src/main/java/com/youlai/boot/infra/file/model/FileInfo.java similarity index 88% rename from src/main/java/com/youlai/boot/platform/file/model/FileInfo.java rename to src/main/java/com/youlai/boot/infra/file/model/FileInfo.java index b50acc51..0ed7d602 100644 --- a/src/main/java/com/youlai/boot/platform/file/model/FileInfo.java +++ b/src/main/java/com/youlai/boot/infra/file/model/FileInfo.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.file.model; +package com.youlai.boot.infra.file.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/file/service/FileService.java b/src/main/java/com/youlai/boot/infra/file/service/FileService.java similarity index 82% rename from src/main/java/com/youlai/boot/platform/file/service/FileService.java rename to src/main/java/com/youlai/boot/infra/file/service/FileService.java index 501abfdc..c013e6af 100644 --- a/src/main/java/com/youlai/boot/platform/file/service/FileService.java +++ b/src/main/java/com/youlai/boot/infra/file/service/FileService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.platform.file.service; +package com.youlai.boot.infra.file.service; -import com.youlai.boot.platform.file.model.FileInfo; +import com.youlai.boot.infra.file.model.FileInfo; import org.springframework.web.multipart.MultipartFile; /** diff --git a/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java b/src/main/java/com/youlai/boot/infra/file/service/impl/AliyunFileService.java similarity index 95% rename from src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java rename to src/main/java/com/youlai/boot/infra/file/service/impl/AliyunFileService.java index 4831cbc1..d51dbabd 100644 --- a/src/main/java/com/youlai/boot/platform/file/service/impl/AliyunFileService.java +++ b/src/main/java/com/youlai/boot/infra/file/service/impl/AliyunFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.file.service.impl; +package com.youlai.boot.infra.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.platform.file.service.FileService; -import com.youlai.boot.platform.file.model.FileInfo; +import com.youlai.boot.infra.file.service.FileService; +import com.youlai.boot.infra.file.model.FileInfo; import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/platform/file/service/impl/LocalFileService.java b/src/main/java/com/youlai/boot/infra/file/service/impl/LocalFileService.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/file/service/impl/LocalFileService.java rename to src/main/java/com/youlai/boot/infra/file/service/impl/LocalFileService.java index 15fb9761..aedea833 100644 --- a/src/main/java/com/youlai/boot/platform/file/service/impl/LocalFileService.java +++ b/src/main/java/com/youlai/boot/infra/file/service/impl/LocalFileService.java @@ -1,11 +1,11 @@ -package com.youlai.boot.platform.file.service.impl; +package com.youlai.boot.infra.file.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import com.youlai.boot.platform.file.model.FileInfo; -import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.infra.file.model.FileInfo; +import com.youlai.boot.infra.file.service.FileService; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java b/src/main/java/com/youlai/boot/infra/file/service/impl/MinioFileService.java similarity index 97% rename from src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java rename to src/main/java/com/youlai/boot/infra/file/service/impl/MinioFileService.java index be2ecafd..e3300b44 100644 --- a/src/main/java/com/youlai/boot/platform/file/service/impl/MinioFileService.java +++ b/src/main/java/com/youlai/boot/infra/file/service/impl/MinioFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.file.service.impl; +package com.youlai.boot.infra.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -7,8 +7,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.youlai.boot.core.exception.BusinessException; import com.youlai.boot.core.web.ResultCode; -import com.youlai.boot.platform.file.model.FileInfo; -import com.youlai.boot.platform.file.service.FileService; +import com.youlai.boot.infra.file.model.FileInfo; +import com.youlai.boot.infra.file.service.FileService; import io.minio.*; import io.minio.http.Method; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java b/src/main/java/com/youlai/boot/infra/mail/controller/MailController.java similarity index 76% rename from src/main/java/com/youlai/boot/platform/mail/controller/MailController.java rename to src/main/java/com/youlai/boot/infra/mail/controller/MailController.java index f31c127b..e7a86d10 100644 --- a/src/main/java/com/youlai/boot/platform/mail/controller/MailController.java +++ b/src/main/java/com/youlai/boot/infra/mail/controller/MailController.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.mail.controller; +package com.youlai.boot.infra.mail.controller; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/youlai/boot/platform/mail/service/MailService.java b/src/main/java/com/youlai/boot/infra/mail/service/MailService.java similarity index 92% rename from src/main/java/com/youlai/boot/platform/mail/service/MailService.java rename to src/main/java/com/youlai/boot/infra/mail/service/MailService.java index f1304cfd..6dec6c87 100644 --- a/src/main/java/com/youlai/boot/platform/mail/service/MailService.java +++ b/src/main/java/com/youlai/boot/infra/mail/service/MailService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.mail.service; +package com.youlai.boot.infra.mail.service; /** * 邮件服务接口层 diff --git a/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java b/src/main/java/com/youlai/boot/infra/mail/service/impl/MailServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java rename to src/main/java/com/youlai/boot/infra/mail/service/impl/MailServiceImpl.java index 9ffc74b7..5995bba6 100644 --- a/src/main/java/com/youlai/boot/platform/mail/service/impl/MailServiceImpl.java +++ b/src/main/java/com/youlai/boot/infra/mail/service/impl/MailServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.boot.platform.mail.service.impl; +package com.youlai.boot.infra.mail.service.impl; import com.youlai.boot.config.property.MailProperties; -import com.youlai.boot.platform.mail.service.MailService; +import com.youlai.boot.infra.mail.service.MailService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java b/src/main/java/com/youlai/boot/infra/sms/controller/SmsController.java similarity index 66% rename from src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java rename to src/main/java/com/youlai/boot/infra/sms/controller/SmsController.java index c88b3f29..2654e795 100644 --- a/src/main/java/com/youlai/boot/platform/sms/controller/SmsController.java +++ b/src/main/java/com/youlai/boot/infra/sms/controller/SmsController.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.sms.controller; +package com.youlai.boot.infra.sms.controller; /** * 短信控制层 diff --git a/src/main/java/com/youlai/boot/platform/sms/enums/SmsTypeEnum.java b/src/main/java/com/youlai/boot/infra/sms/enums/SmsTypeEnum.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/sms/enums/SmsTypeEnum.java rename to src/main/java/com/youlai/boot/infra/sms/enums/SmsTypeEnum.java index ceede8a8..1c2e6c23 100644 --- a/src/main/java/com/youlai/boot/platform/sms/enums/SmsTypeEnum.java +++ b/src/main/java/com/youlai/boot/infra/sms/enums/SmsTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.sms.enums; +package com.youlai.boot.infra.sms.enums; import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java b/src/main/java/com/youlai/boot/infra/sms/service/SmsService.java similarity index 85% rename from src/main/java/com/youlai/boot/platform/sms/service/SmsService.java rename to src/main/java/com/youlai/boot/infra/sms/service/SmsService.java index d4097353..c61f1c7d 100644 --- a/src/main/java/com/youlai/boot/platform/sms/service/SmsService.java +++ b/src/main/java/com/youlai/boot/infra/sms/service/SmsService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.platform.sms.service; +package com.youlai.boot.infra.sms.service; -import com.youlai.boot.platform.sms.enums.SmsTypeEnum; +import com.youlai.boot.infra.sms.enums.SmsTypeEnum; import java.util.Map; diff --git a/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java b/src/main/java/com/youlai/boot/infra/sms/service/impl/AliyunSmsService.java similarity index 94% rename from src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java rename to src/main/java/com/youlai/boot/infra/sms/service/impl/AliyunSmsService.java index a9adac40..ee338195 100644 --- a/src/main/java/com/youlai/boot/platform/sms/service/impl/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/infra/sms/service/impl/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.sms.service.impl; +package com.youlai.boot.infra.sms.service.impl; import cn.hutool.json.JSONUtil; import com.aliyuncs.CommonRequest; @@ -9,8 +9,8 @@ import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; import com.youlai.boot.config.property.AliyunSmsProperties; -import com.youlai.boot.platform.sms.enums.SmsTypeEnum; -import com.youlai.boot.platform.sms.service.SmsService; +import com.youlai.boot.infra.sms.enums.SmsTypeEnum; +import com.youlai.boot.infra.sms.service.SmsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/platform/websocket/dto/DictChangeEvent.java b/src/main/java/com/youlai/boot/infra/websocket/dto/DictChangeEvent.java similarity index 95% rename from src/main/java/com/youlai/boot/platform/websocket/dto/DictChangeEvent.java rename to src/main/java/com/youlai/boot/infra/websocket/dto/DictChangeEvent.java index 1835694f..e31089ae 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/dto/DictChangeEvent.java +++ b/src/main/java/com/youlai/boot/infra/websocket/dto/DictChangeEvent.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.websocket.dto; +package com.youlai.boot.infra.websocket.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/websocket/dto/OnlineUserDTO.java b/src/main/java/com/youlai/boot/infra/websocket/dto/OnlineUserDTO.java similarity index 93% rename from src/main/java/com/youlai/boot/platform/websocket/dto/OnlineUserDTO.java rename to src/main/java/com/youlai/boot/infra/websocket/dto/OnlineUserDTO.java index eaac9ea6..f2e610b8 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/dto/OnlineUserDTO.java +++ b/src/main/java/com/youlai/boot/infra/websocket/dto/OnlineUserDTO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.websocket.dto; +package com.youlai.boot.infra.websocket.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/websocket/job/OnlineUserCountJob.java b/src/main/java/com/youlai/boot/infra/websocket/job/OnlineUserCountJob.java similarity index 83% rename from src/main/java/com/youlai/boot/platform/websocket/job/OnlineUserCountJob.java rename to src/main/java/com/youlai/boot/infra/websocket/job/OnlineUserCountJob.java index 308ea81b..6ecefc6e 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/job/OnlineUserCountJob.java +++ b/src/main/java/com/youlai/boot/infra/websocket/job/OnlineUserCountJob.java @@ -1,8 +1,8 @@ -package com.youlai.boot.platform.websocket.job; +package com.youlai.boot.infra.websocket.job; -import com.youlai.boot.platform.websocket.publisher.WebSocketPublisher; -import com.youlai.boot.platform.websocket.session.UserSessionRegistry; -import com.youlai.boot.platform.websocket.topic.WebSocketTopics; +import com.youlai.boot.infra.websocket.publisher.WebSocketPublisher; +import com.youlai.boot.infra.websocket.session.UserSessionRegistry; +import com.youlai.boot.infra.websocket.topic.WebSocketTopics; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/youlai/boot/platform/websocket/publisher/WebSocketPublisher.java b/src/main/java/com/youlai/boot/infra/websocket/publisher/WebSocketPublisher.java similarity index 97% rename from src/main/java/com/youlai/boot/platform/websocket/publisher/WebSocketPublisher.java rename to src/main/java/com/youlai/boot/infra/websocket/publisher/WebSocketPublisher.java index 7d5f4d36..993d8ef4 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/publisher/WebSocketPublisher.java +++ b/src/main/java/com/youlai/boot/infra/websocket/publisher/WebSocketPublisher.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.websocket.publisher; +package com.youlai.boot.infra.websocket.publisher; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/platform/websocket/service/WebSocketService.java b/src/main/java/com/youlai/boot/infra/websocket/service/WebSocketService.java similarity index 90% rename from src/main/java/com/youlai/boot/platform/websocket/service/WebSocketService.java rename to src/main/java/com/youlai/boot/infra/websocket/service/WebSocketService.java index 1627a4f9..4cdb471f 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/service/WebSocketService.java +++ b/src/main/java/com/youlai/boot/infra/websocket/service/WebSocketService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.platform.websocket.service; +package com.youlai.boot.infra.websocket.service; -import com.youlai.boot.platform.websocket.dto.OnlineUserDTO; +import com.youlai.boot.infra.websocket.dto.OnlineUserDTO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java b/src/main/java/com/youlai/boot/infra/websocket/service/impl/WebSocketServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java rename to src/main/java/com/youlai/boot/infra/websocket/service/impl/WebSocketServiceImpl.java index 2ded5720..5890937c 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/service/impl/WebSocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/infra/websocket/service/impl/WebSocketServiceImpl.java @@ -1,11 +1,11 @@ -package com.youlai.boot.platform.websocket.service.impl; +package com.youlai.boot.infra.websocket.service.impl; -import com.youlai.boot.platform.websocket.dto.DictChangeEvent; -import com.youlai.boot.platform.websocket.dto.OnlineUserDTO; -import com.youlai.boot.platform.websocket.publisher.WebSocketPublisher; -import com.youlai.boot.platform.websocket.session.UserSessionRegistry; -import com.youlai.boot.platform.websocket.service.WebSocketService; -import com.youlai.boot.platform.websocket.topic.WebSocketTopics; +import com.youlai.boot.infra.websocket.dto.DictChangeEvent; +import com.youlai.boot.infra.websocket.dto.OnlineUserDTO; +import com.youlai.boot.infra.websocket.publisher.WebSocketPublisher; +import com.youlai.boot.infra.websocket.session.UserSessionRegistry; +import com.youlai.boot.infra.websocket.service.WebSocketService; +import com.youlai.boot.infra.websocket.topic.WebSocketTopics; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java b/src/main/java/com/youlai/boot/infra/websocket/session/UserSessionRegistry.java similarity index 97% rename from src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java rename to src/main/java/com/youlai/boot/infra/websocket/session/UserSessionRegistry.java index 1377e9b5..ba354baa 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/session/UserSessionRegistry.java +++ b/src/main/java/com/youlai/boot/infra/websocket/session/UserSessionRegistry.java @@ -1,6 +1,6 @@ -package com.youlai.boot.platform.websocket.session; +package com.youlai.boot.infra.websocket.session; -import com.youlai.boot.platform.websocket.dto.OnlineUserDTO; +import com.youlai.boot.infra.websocket.dto.OnlineUserDTO; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/platform/websocket/topic/WebSocketTopics.java b/src/main/java/com/youlai/boot/infra/websocket/topic/WebSocketTopics.java similarity index 89% rename from src/main/java/com/youlai/boot/platform/websocket/topic/WebSocketTopics.java rename to src/main/java/com/youlai/boot/infra/websocket/topic/WebSocketTopics.java index ee88a81c..8b77b0b6 100644 --- a/src/main/java/com/youlai/boot/platform/websocket/topic/WebSocketTopics.java +++ b/src/main/java/com/youlai/boot/infra/websocket/topic/WebSocketTopics.java @@ -1,4 +1,4 @@ -package com.youlai.boot.platform.websocket.topic; +package com.youlai.boot.infra.websocket.topic; public final class WebSocketTopics { diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java index 28f0b1aa..f9e81e32 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -16,7 +16,7 @@ import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.service.DictItemService; import com.youlai.boot.system.service.DictService; -import com.youlai.boot.platform.websocket.service.WebSocketService; +import com.youlai.boot.infra.websocket.service.WebSocketService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/system/service/MenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java index 389ec2bb..81f3c2b3 100644 --- a/src/main/java/com/youlai/boot/system/service/MenuService.java +++ b/src/main/java/com/youlai/boot/system/service/MenuService.java @@ -1,7 +1,7 @@ package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.platform.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.entity.GenTable; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.entity.Menu; @@ -10,7 +10,6 @@ import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.system.model.vo.RouteVO; import java.util.List; -import java.util.Set; /** * 菜单业务接口 diff --git a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java index 4aba4eb3..2af86c2a 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import tools.jackson.core.type.TypeReference; import tools.jackson.databind.ObjectMapper; -import com.youlai.boot.platform.codegen.model.entity.GenTable; +import com.youlai.boot.infra.codegen.model.entity.GenTable; import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.converter.MenuConverter; import com.youlai.boot.system.mapper.MenuMapper; @@ -163,7 +163,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me // 双重保障：动态查询"平台管理"目录，过滤其子菜单 // 通过路由路径识别平台管理目录，避免硬编码 Menu platformMenu = this.getOne(new LambdaQueryWrapper() - .eq(Menu::getRoutePath, "/platform") + .eq(Menu::getRoutePath, "/infra") .eq(Menu::getParentId, SystemConstants.ROOT_NODE_ID) .eq(Menu::getType, MenuTypeEnum.CATALOG.getValue()) .last("LIMIT 1") diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java index 2aaceefc..83dbbcb0 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java @@ -8,7 +8,7 @@ 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.boot.core.exception.BusinessException; -import com.youlai.boot.platform.websocket.dto.OnlineUserDTO; +import com.youlai.boot.infra.websocket.dto.OnlineUserDTO; import com.youlai.boot.security.util.SecurityUtils; import com.youlai.boot.system.converter.NoticeConverter; import com.youlai.boot.system.enums.NoticePublishStatusEnum; @@ -27,7 +27,7 @@ import com.youlai.boot.system.model.vo.NoticeDetailVO; import com.youlai.boot.system.service.NoticeService; import com.youlai.boot.system.service.UserNoticeService; import com.youlai.boot.system.service.UserService; -import com.youlai.boot.platform.websocket.service.WebSocketService; +import com.youlai.boot.infra.websocket.service.WebSocketService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index 0f969417..2e4be559 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -12,9 +12,9 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SystemConstants; import com.youlai.boot.core.exception.BusinessException; import com.youlai.boot.common.model.Option; -import com.youlai.boot.platform.mail.service.MailService; -import com.youlai.boot.platform.sms.enums.SmsTypeEnum; -import com.youlai.boot.platform.sms.service.SmsService; +import com.youlai.boot.infra.mail.service.MailService; +import com.youlai.boot.infra.sms.enums.SmsTypeEnum; +import com.youlai.boot.infra.sms.service.SmsService; import com.youlai.boot.security.model.RoleDataScope; import com.youlai.boot.security.model.UserAuthInfo; import com.youlai.boot.security.token.TokenManager; @@ -27,7 +27,6 @@ import com.youlai.boot.system.model.dto.CurrentUserDTO; import com.youlai.boot.system.model.dto.UserExportDTO; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.entity.User; -import com.youlai.boot.system.model.entity.UserRole; import com.youlai.boot.system.model.form.*; import com.youlai.boot.system.model.query.UserQuery; import com.youlai.boot.system.model.vo.UserPageVO; @@ -40,7 +39,6 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/src/main/resources/mapper/codegen/DatabaseMapper.xml b/src/main/resources/mapper/codegen/DatabaseMapper.xml index b7a8b34f..56f35ad4 100644 --- a/src/main/resources/mapper/codegen/DatabaseMapper.xml +++ b/src/main/resources/mapper/codegen/DatabaseMapper.xml @@ -6,7 +6,7 @@ - SELECT t1.TABLE_NAME , t1.TABLE_COMMENT , @@ -35,7 +35,7 @@ - SELECT TABLE_NAME , TABLE_COMMENT , @@ -50,7 +50,7 @@ - SELECT COLUMN_NAME, DATA_TYPE, diff --git a/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java b/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java index 9fe3350b..064d17a0 100644 --- a/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java +++ b/src/test/java/com/youlai/boot/generator/SystemCodeGenerator.java @@ -39,8 +39,8 @@ public class SystemCodeGenerator { .parent("com.youlai.boot.system") .entity("model.entity") .mapper("mapper") - .service("platform") - .serviceImpl("platform.impl") + .service("infra") + .serviceImpl("infra.impl") .controller("controller") .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper")); }