diff --git a/Dockerfile b/Dockerfile index b9d182a5..3ebb3846 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,4 @@ CMD java \ -jar /app.jar # 暴露端口 -EXPOSE 8989 +EXPOSE 8000 diff --git a/README.md b/README.md index 2a14eb2a..416111e8 100644 --- a/README.md +++ b/README.md @@ -103,21 +103,23 @@ spring: youlai-boot ├── docker/ # Docker 部署 ├── sql/ # 数据库脚本 -├── src/main/java/com/youlai/boot/ +├── src/ │ ├── auth/ # 认证授权业务 +│ ├── codegen/ # 代码生成器 │ ├── common/ # 全局通用（常量、枚举、工具类、统一响应结果） -│ ├── framework/ # 底层技术基座（高内聚积木块） +│ ├── framework/ # 底层技术基座（缓存/验证码/安全/Web等） +│ │ ├── apidoc/ # OpenAPI/Swagger 文档 │ │ ├── cache/ # Redis/Caffeine 缓存 │ │ ├── captcha/ # 验证码 │ │ ├── integration/ # SMS/Mail/WxMa 集成 │ │ ├── job/ # XxlJob 定时任务 │ │ ├── mybatis/ # 数据库/MP配置/拦截器 -│ │ ├── openapi/ # OpenAPI/Swagger 文档 │ │ ├── security/ # 鉴权过滤器/Token机制 │ │ └── web/ # 跨域/全局异常/限流/Jackson -│ ├── module/ # 业务模块（File、Codegen 等） +│ ├── message/ # 消息中心 +│ ├── file/ # 文件中心 │ ├── system/ # 核心系统模块（用户/角色/菜单/部门） -│ └── YouLaiBootApplication.java # 启动类 +│ └── YouLaiBootApplication.java # 启动类 └── pom.xml # Maven 配置 ``` 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 0f656436..086caa17 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 @@ -11,7 +11,6 @@ import com.youlai.boot.framework.security.token.TokenManager; import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum; import com.youlai.boot.framework.integration.sms.service.SmsService; -import com.youlai.boot.system.service.LogService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; @@ -42,7 +41,7 @@ public class AuthServiceImpl implements AuthService { private final SmsService smsService; private final RedisTemplate redisTemplate; private final CaptchaService captchaService; - private final LogService logService; + /** * 用户名密码登录 * diff --git a/src/main/java/com/youlai/boot/auth/service/impl/WxMaAuthServiceImpl.java b/src/main/java/com/youlai/boot/auth/service/impl/WxMaAuthServiceImpl.java index 1586f0c5..02d85bbf 100644 --- a/src/main/java/com/youlai/boot/auth/service/impl/WxMaAuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/auth/service/impl/WxMaAuthServiceImpl.java @@ -11,7 +11,7 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.framework.security.exception.NeedBindMobileException; import com.youlai.boot.framework.security.model.AuthenticationToken; import com.youlai.boot.framework.security.model.SysUserDetails; -import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken; +import com.youlai.boot.framework.security.model.WxMaAuthenticationToken; import com.youlai.boot.framework.security.token.TokenManager; import com.youlai.boot.system.enums.SocialPlatformEnum; import com.youlai.boot.system.model.entity.SysUser; @@ -55,7 +55,7 @@ public class WxMaAuthServiceImpl implements WxMaAuthService { */ @Override public WxMaLoginResp silentLogin(String code) { - WechatMiniAuthenticationToken token = new WechatMiniAuthenticationToken(code); + WxMaAuthenticationToken token = new WxMaAuthenticationToken(code); try { Authentication authentication = authenticationManager.authenticate(token); diff --git a/src/main/java/com/youlai/boot/module/codegen/config/CodegenProperties.java b/src/main/java/com/youlai/boot/codegen/config/CodegenProperties.java similarity index 90% rename from src/main/java/com/youlai/boot/module/codegen/config/CodegenProperties.java rename to src/main/java/com/youlai/boot/codegen/config/CodegenProperties.java index 85b2e639..5f327996 100644 --- a/src/main/java/com/youlai/boot/module/codegen/config/CodegenProperties.java +++ b/src/main/java/com/youlai/boot/codegen/config/CodegenProperties.java @@ -1,9 +1,10 @@ -package com.youlai.boot.module.codegen.config; +package com.youlai.boot.codegen.config; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.map.MapUtil; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.stereotype.Component; import java.util.List; @@ -16,6 +17,7 @@ import java.util.Map; * @since 2.11.0 */ @Component +@EnableConfigurationProperties(CodegenProperties.class) @ConfigurationProperties(prefix = "codegen") @Data public class CodegenProperties { diff --git a/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/codegen/controller/CodegenController.java similarity index 89% rename from src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java rename to src/main/java/com/youlai/boot/codegen/controller/CodegenController.java index ed2c6f09..7e589f1a 100644 --- a/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/codegen/controller/CodegenController.java @@ -1,18 +1,18 @@ -package com.youlai.boot.module.codegen.controller; +package com.youlai.boot.codegen.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; -import com.youlai.boot.module.codegen.config.CodegenProperties; +import com.youlai.boot.codegen.config.CodegenProperties; import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.module.codegen.service.CodegenService; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; -import com.youlai.boot.module.codegen.model.query.TableQuery; -import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.codegen.service.CodegenService; +import com.youlai.boot.codegen.model.form.GenConfigForm; +import com.youlai.boot.codegen.model.query.TableQuery; +import com.youlai.boot.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.codegen.model.vo.TablePageVO; import com.youlai.boot.common.annotation.Log; -import com.youlai.boot.module.codegen.service.GenTableService; +import com.youlai.boot.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/module/codegen/converter/CodegenConverter.java b/src/main/java/com/youlai/boot/codegen/converter/CodegenConverter.java similarity index 84% rename from src/main/java/com/youlai/boot/module/codegen/converter/CodegenConverter.java rename to src/main/java/com/youlai/boot/codegen/converter/CodegenConverter.java index 84d20523..0ac20383 100644 --- a/src/main/java/com/youlai/boot/module/codegen/converter/CodegenConverter.java +++ b/src/main/java/com/youlai/boot/codegen/converter/CodegenConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.codegen.converter; +package com.youlai.boot.codegen.converter; -import com.youlai.boot.module.codegen.model.entity.GenTable; -import com.youlai.boot.module.codegen.model.entity.GenTableColumn; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; +import com.youlai.boot.codegen.model.entity.GenTable; +import com.youlai.boot.codegen.model.entity.GenTableColumn; +import com.youlai.boot.codegen.model.form.GenConfigForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/module/codegen/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/codegen/enums/FormTypeEnum.java similarity index 97% rename from src/main/java/com/youlai/boot/module/codegen/enums/FormTypeEnum.java rename to src/main/java/com/youlai/boot/codegen/enums/FormTypeEnum.java index 4505e2b3..f006f92e 100644 --- a/src/main/java/com/youlai/boot/module/codegen/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/codegen/enums/FormTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.enums; +package com.youlai.boot.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/module/codegen/enums/JavaTypeEnum.java b/src/main/java/com/youlai/boot/codegen/enums/JavaTypeEnum.java similarity index 98% rename from src/main/java/com/youlai/boot/module/codegen/enums/JavaTypeEnum.java rename to src/main/java/com/youlai/boot/codegen/enums/JavaTypeEnum.java index caa3beb4..0ee49a10 100644 --- a/src/main/java/com/youlai/boot/module/codegen/enums/JavaTypeEnum.java +++ b/src/main/java/com/youlai/boot/codegen/enums/JavaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.enums; +package com.youlai.boot.codegen.enums; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/module/codegen/enums/QueryTypeEnum.java b/src/main/java/com/youlai/boot/codegen/enums/QueryTypeEnum.java similarity index 96% rename from src/main/java/com/youlai/boot/module/codegen/enums/QueryTypeEnum.java rename to src/main/java/com/youlai/boot/codegen/enums/QueryTypeEnum.java index 5e665ed7..fcdff5f3 100644 --- a/src/main/java/com/youlai/boot/module/codegen/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/codegen/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.enums; +package com.youlai.boot.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/codegen/mapper/DatabaseMapper.java similarity index 71% rename from src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/codegen/mapper/DatabaseMapper.java index dfcc0685..1e370d15 100644 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/codegen/mapper/DatabaseMapper.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.codegen.mapper; +package com.youlai.boot.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.codegen.model.vo.ColumnMetaVO; -import com.youlai.boot.module.codegen.model.vo.TableMetaVO; -import com.youlai.boot.module.codegen.model.query.TableQuery; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.codegen.model.vo.ColumnMetaVO; +import com.youlai.boot.codegen.model.vo.TableMetaVO; +import com.youlai.boot.codegen.model.query.TableQuery; +import com.youlai.boot.codegen.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/GenTableColumnMapper.java b/src/main/java/com/youlai/boot/codegen/mapper/GenTableColumnMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/codegen/mapper/GenTableColumnMapper.java rename to src/main/java/com/youlai/boot/codegen/mapper/GenTableColumnMapper.java index d5b6e16b..cf563277 100644 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/GenTableColumnMapper.java +++ b/src/main/java/com/youlai/boot/codegen/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.mapper; +package com.youlai.boot.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.codegen.model.entity.GenTableColumn; +import com.youlai.boot.codegen.model.entity.GenTableColumn; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/GenTableMapper.java b/src/main/java/com/youlai/boot/codegen/mapper/GenTableMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/codegen/mapper/GenTableMapper.java rename to src/main/java/com/youlai/boot/codegen/mapper/GenTableMapper.java index 616c84e6..245e30f3 100644 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/GenTableMapper.java +++ b/src/main/java/com/youlai/boot/codegen/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.mapper; +package com.youlai.boot.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.codegen.model.entity.GenTable; +import com.youlai.boot.codegen.model.entity.GenTable; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenTable.java b/src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java similarity index 94% rename from src/main/java/com/youlai/boot/module/codegen/model/entity/GenTable.java rename to src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java index 5d03aaad..51f5f289 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenTable.java +++ b/src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.entity; +package com.youlai.boot.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenTableColumn.java b/src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java similarity index 90% rename from src/main/java/com/youlai/boot/module/codegen/model/entity/GenTableColumn.java rename to src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java index 5c3d868e..a2640747 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenTableColumn.java +++ b/src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.codegen.model.entity; +package com.youlai.boot.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.module.codegen.enums.FormTypeEnum; -import com.youlai.boot.module.codegen.enums.QueryTypeEnum; +import com.youlai.boot.codegen.enums.FormTypeEnum; +import com.youlai.boot.codegen.enums.QueryTypeEnum; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/codegen/model/form/GenConfigForm.java similarity index 94% rename from src/main/java/com/youlai/boot/module/codegen/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/codegen/model/form/GenConfigForm.java index 509f71b8..5e584e0d 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/codegen/model/form/GenConfigForm.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.model.form; +package com.youlai.boot.codegen.model.form; -import com.youlai.boot.module.codegen.enums.FormTypeEnum; -import com.youlai.boot.module.codegen.enums.QueryTypeEnum; +import com.youlai.boot.codegen.enums.FormTypeEnum; +import com.youlai.boot.codegen.enums.QueryTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/codegen/model/query/TablePageQuery.java similarity index 91% rename from src/main/java/com/youlai/boot/module/codegen/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/codegen/model/query/TablePageQuery.java index ad6c69f1..51b88c96 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/codegen/model/query/TablePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.query; +package com.youlai.boot.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/module/codegen/model/query/TableQuery.java b/src/main/java/com/youlai/boot/codegen/model/query/TableQuery.java similarity index 91% rename from src/main/java/com/youlai/boot/module/codegen/model/query/TableQuery.java rename to src/main/java/com/youlai/boot/codegen/model/query/TableQuery.java index 8c633009..031aa2cc 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/query/TableQuery.java +++ b/src/main/java/com/youlai/boot/codegen/model/query/TableQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.query; +package com.youlai.boot.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/module/codegen/model/vo/CodegenPreviewVO.java b/src/main/java/com/youlai/boot/codegen/model/vo/CodegenPreviewVO.java similarity index 92% rename from src/main/java/com/youlai/boot/module/codegen/model/vo/CodegenPreviewVO.java rename to src/main/java/com/youlai/boot/codegen/model/vo/CodegenPreviewVO.java index c1332de0..a0384a00 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/vo/CodegenPreviewVO.java +++ b/src/main/java/com/youlai/boot/codegen/model/vo/CodegenPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.vo; +package com.youlai.boot.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java b/src/main/java/com/youlai/boot/codegen/model/vo/ColumnMetaVO.java similarity index 89% rename from src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java rename to src/main/java/com/youlai/boot/codegen/model/vo/ColumnMetaVO.java index 725746f7..c5ba3821 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/vo/ColumnMetaVO.java +++ b/src/main/java/com/youlai/boot/codegen/model/vo/ColumnMetaVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.vo; +package com.youlai.boot.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/vo/TableMetaVO.java b/src/main/java/com/youlai/boot/codegen/model/vo/TableMetaVO.java similarity index 86% rename from src/main/java/com/youlai/boot/module/codegen/model/vo/TableMetaVO.java rename to src/main/java/com/youlai/boot/codegen/model/vo/TableMetaVO.java index 4df1bfe4..7ad0be56 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/vo/TableMetaVO.java +++ b/src/main/java/com/youlai/boot/codegen/model/vo/TableMetaVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.vo; +package com.youlai.boot.codegen.model.vo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/codegen/model/vo/TablePageVO.java similarity index 94% rename from src/main/java/com/youlai/boot/module/codegen/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/codegen/model/vo/TablePageVO.java index 369f2409..3d482f5f 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/codegen/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.vo; +package com.youlai.boot.codegen.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/service/CodegenService.java b/src/main/java/com/youlai/boot/codegen/service/CodegenService.java similarity index 75% rename from src/main/java/com/youlai/boot/module/codegen/service/CodegenService.java rename to src/main/java/com/youlai/boot/codegen/service/CodegenService.java index 737eb2d8..9e8ebb7f 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/CodegenService.java +++ b/src/main/java/com/youlai/boot/codegen/service/CodegenService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.codegen.service; +package com.youlai.boot.codegen.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.codegen.model.query.TableQuery; -import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.codegen.model.query.TableQuery; +import com.youlai.boot.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.codegen.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/codegen/service/GenTableColumnService.java b/src/main/java/com/youlai/boot/codegen/service/GenTableColumnService.java similarity index 64% rename from src/main/java/com/youlai/boot/module/codegen/service/GenTableColumnService.java rename to src/main/java/com/youlai/boot/codegen/service/GenTableColumnService.java index b08f9318..c175a8dd 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/GenTableColumnService.java +++ b/src/main/java/com/youlai/boot/codegen/service/GenTableColumnService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.service; +package com.youlai.boot.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.codegen.model.entity.GenTableColumn; +import com.youlai.boot.codegen.model.entity.GenTableColumn; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/module/codegen/service/GenTableService.java b/src/main/java/com/youlai/boot/codegen/service/GenTableService.java similarity index 79% rename from src/main/java/com/youlai/boot/module/codegen/service/GenTableService.java rename to src/main/java/com/youlai/boot/codegen/service/GenTableService.java index ee5962ea..44dbaa7c 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/GenTableService.java +++ b/src/main/java/com/youlai/boot/codegen/service/GenTableService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.codegen.service; +package com.youlai.boot.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.codegen.model.entity.GenTable; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; +import com.youlai.boot.codegen.model.entity.GenTable; +import com.youlai.boot.codegen.model.form.GenConfigForm; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java rename to src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java index 09800cbd..3589529c 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.service.impl; +package com.youlai.boot.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.module.codegen.enums.JavaTypeEnum; -import com.youlai.boot.module.codegen.config.CodegenProperties; -import com.youlai.boot.module.codegen.service.GenTableService; -import com.youlai.boot.module.codegen.service.GenTableColumnService; -import com.youlai.boot.module.codegen.service.CodegenService; +import com.youlai.boot.codegen.enums.JavaTypeEnum; +import com.youlai.boot.codegen.config.CodegenProperties; +import com.youlai.boot.codegen.service.GenTableService; +import com.youlai.boot.codegen.service.GenTableColumnService; +import com.youlai.boot.codegen.service.CodegenService; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.module.codegen.mapper.DatabaseMapper; -import com.youlai.boot.module.codegen.model.entity.GenTable; -import com.youlai.boot.module.codegen.model.entity.GenTableColumn; -import com.youlai.boot.module.codegen.model.query.TableQuery; -import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.codegen.mapper.DatabaseMapper; +import com.youlai.boot.codegen.model.entity.GenTable; +import com.youlai.boot.codegen.model.entity.GenTableColumn; +import com.youlai.boot.codegen.model.query.TableQuery; +import com.youlai.boot.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.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/module/codegen/service/impl/GenTableColumnServiceImpl.java b/src/main/java/com/youlai/boot/codegen/service/impl/GenTableColumnServiceImpl.java similarity index 61% rename from src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableColumnServiceImpl.java rename to src/main/java/com/youlai/boot/codegen/service/impl/GenTableColumnServiceImpl.java index 9102a905..34b8229a 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableColumnServiceImpl.java +++ b/src/main/java/com/youlai/boot/codegen/service/impl/GenTableColumnServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.codegen.service.impl; +package com.youlai.boot.codegen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.codegen.mapper.GenTableColumnMapper; -import com.youlai.boot.module.codegen.model.entity.GenTableColumn; -import com.youlai.boot.module.codegen.service.GenTableColumnService; +import com.youlai.boot.codegen.mapper.GenTableColumnMapper; +import com.youlai.boot.codegen.model.entity.GenTableColumn; +import com.youlai.boot.codegen.service.GenTableColumnService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java b/src/main/java/com/youlai/boot/codegen/service/impl/GenTableServiceImpl.java similarity index 90% rename from src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java rename to src/main/java/com/youlai/boot/codegen/service/impl/GenTableServiceImpl.java index f4f888ec..6df5b3d5 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/GenTableServiceImpl.java +++ b/src/main/java/com/youlai/boot/codegen/service/impl/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.service.impl; +package com.youlai.boot.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.module.codegen.enums.FormTypeEnum; -import com.youlai.boot.module.codegen.enums.JavaTypeEnum; -import com.youlai.boot.module.codegen.enums.QueryTypeEnum; +import com.youlai.boot.codegen.enums.FormTypeEnum; +import com.youlai.boot.codegen.enums.JavaTypeEnum; +import com.youlai.boot.codegen.enums.QueryTypeEnum; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.module.codegen.config.CodegenProperties; -import com.youlai.boot.module.codegen.converter.CodegenConverter; -import com.youlai.boot.module.codegen.mapper.DatabaseMapper; -import com.youlai.boot.module.codegen.mapper.GenTableMapper; -import com.youlai.boot.module.codegen.model.vo.ColumnMetaVO; -import com.youlai.boot.module.codegen.model.vo.TableMetaVO; -import com.youlai.boot.module.codegen.model.entity.GenTable; -import com.youlai.boot.module.codegen.model.entity.GenTableColumn; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; -import com.youlai.boot.module.codegen.service.GenTableService; -import com.youlai.boot.module.codegen.service.GenTableColumnService; +import com.youlai.boot.codegen.config.CodegenProperties; +import com.youlai.boot.codegen.converter.CodegenConverter; +import com.youlai.boot.codegen.mapper.DatabaseMapper; +import com.youlai.boot.codegen.mapper.GenTableMapper; +import com.youlai.boot.codegen.model.vo.ColumnMetaVO; +import com.youlai.boot.codegen.model.vo.TableMetaVO; +import com.youlai.boot.codegen.model.entity.GenTable; +import com.youlai.boot.codegen.model.entity.GenTableColumn; +import com.youlai.boot.codegen.model.form.GenConfigForm; +import com.youlai.boot.codegen.service.GenTableService; +import com.youlai.boot.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/module/file/controller/FileController.java b/src/main/java/com/youlai/boot/file/controller/FileController.java similarity index 91% rename from src/main/java/com/youlai/boot/module/file/controller/FileController.java rename to src/main/java/com/youlai/boot/file/controller/FileController.java index 47d57246..0975f8c7 100644 --- a/src/main/java/com/youlai/boot/module/file/controller/FileController.java +++ b/src/main/java/com/youlai/boot/file/controller/FileController.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.file.controller; +package com.youlai.boot.file.controller; import com.youlai.boot.common.result.Result; -import com.youlai.boot.module.file.service.FileService; -import com.youlai.boot.module.file.model.FileInfo; +import com.youlai.boot.file.service.FileService; +import com.youlai.boot.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/module/file/model/FileInfo.java b/src/main/java/com/youlai/boot/file/model/FileInfo.java similarity index 88% rename from src/main/java/com/youlai/boot/module/file/model/FileInfo.java rename to src/main/java/com/youlai/boot/file/model/FileInfo.java index 2a3afbdd..5be4f4ca 100644 --- a/src/main/java/com/youlai/boot/module/file/model/FileInfo.java +++ b/src/main/java/com/youlai/boot/file/model/FileInfo.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.file.model; +package com.youlai.boot.file.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/file/service/FileService.java b/src/main/java/com/youlai/boot/file/service/FileService.java similarity index 83% rename from src/main/java/com/youlai/boot/module/file/service/FileService.java rename to src/main/java/com/youlai/boot/file/service/FileService.java index b18b87b4..6e5d2804 100644 --- a/src/main/java/com/youlai/boot/module/file/service/FileService.java +++ b/src/main/java/com/youlai/boot/file/service/FileService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.file.service; +package com.youlai.boot.file.service; -import com.youlai.boot.module.file.model.FileInfo; +import com.youlai.boot.file.model.FileInfo; import org.springframework.web.multipart.MultipartFile; /** diff --git a/src/main/java/com/youlai/boot/module/file/service/impl/AliyunFileService.java b/src/main/java/com/youlai/boot/file/service/impl/AliyunFileService.java similarity index 95% rename from src/main/java/com/youlai/boot/module/file/service/impl/AliyunFileService.java rename to src/main/java/com/youlai/boot/file/service/impl/AliyunFileService.java index 886dfaa6..3d699ff3 100644 --- a/src/main/java/com/youlai/boot/module/file/service/impl/AliyunFileService.java +++ b/src/main/java/com/youlai/boot/file/service/impl/AliyunFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.file.service.impl; +package com.youlai.boot.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.file.service.FileService; -import com.youlai.boot.module.file.model.FileInfo; +import com.youlai.boot.file.service.FileService; +import com.youlai.boot.file.model.FileInfo; import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/module/file/service/impl/LocalFileService.java b/src/main/java/com/youlai/boot/file/service/impl/LocalFileService.java similarity index 95% rename from src/main/java/com/youlai/boot/module/file/service/impl/LocalFileService.java rename to src/main/java/com/youlai/boot/file/service/impl/LocalFileService.java index 061ff5bf..c9239dbb 100644 --- a/src/main/java/com/youlai/boot/module/file/service/impl/LocalFileService.java +++ b/src/main/java/com/youlai/boot/file/service/impl/LocalFileService.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.file.service.impl; +package com.youlai.boot.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.module.file.model.FileInfo; -import com.youlai.boot.module.file.service.FileService; +import com.youlai.boot.file.model.FileInfo; +import com.youlai.boot.file.service.FileService; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/module/file/service/impl/MinioFileService.java b/src/main/java/com/youlai/boot/file/service/impl/MinioFileService.java similarity index 97% rename from src/main/java/com/youlai/boot/module/file/service/impl/MinioFileService.java rename to src/main/java/com/youlai/boot/file/service/impl/MinioFileService.java index 41125235..03e5a32b 100644 --- a/src/main/java/com/youlai/boot/module/file/service/impl/MinioFileService.java +++ b/src/main/java/com/youlai/boot/file/service/impl/MinioFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.file.service.impl; +package com.youlai.boot.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.common.exception.BusinessException; import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.module.file.model.FileInfo; -import com.youlai.boot.module.file.service.FileService; +import com.youlai.boot.file.model.FileInfo; +import com.youlai.boot.file.service.FileService; import io.minio.*; import io.minio.http.Method; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/youlai/boot/framework/openapi/Knife4jOpenApiCustomizer.java b/src/main/java/com/youlai/boot/framework/apidoc/Knife4jOpenApiCustomizer.java similarity index 99% rename from src/main/java/com/youlai/boot/framework/openapi/Knife4jOpenApiCustomizer.java rename to src/main/java/com/youlai/boot/framework/apidoc/Knife4jOpenApiCustomizer.java index b2dd5b2d..6ab80e58 100644 --- a/src/main/java/com/youlai/boot/framework/openapi/Knife4jOpenApiCustomizer.java +++ b/src/main/java/com/youlai/boot/framework/apidoc/Knife4jOpenApiCustomizer.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.openapi; +package com.youlai.boot.framework.apidoc; import com.github.xiaoymin.knife4j.annotations.ApiSupport; diff --git a/src/main/java/com/youlai/boot/framework/openapi/OpenApiConfig.java b/src/main/java/com/youlai/boot/framework/apidoc/OpenApiConfig.java similarity index 98% rename from src/main/java/com/youlai/boot/framework/openapi/OpenApiConfig.java rename to src/main/java/com/youlai/boot/framework/apidoc/OpenApiConfig.java index 1f43c50a..066c69ec 100644 --- a/src/main/java/com/youlai/boot/framework/openapi/OpenApiConfig.java +++ b/src/main/java/com/youlai/boot/framework/apidoc/OpenApiConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.openapi; +package com.youlai.boot.framework.apidoc; import cn.hutool.core.util.ArrayUtil; import com.youlai.boot.framework.security.config.SecurityProperties; diff --git a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java index 68359818..35e26f3c 100644 --- a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java @@ -9,7 +9,7 @@ import com.youlai.boot.framework.security.filter.TokenAuthenticationFilter; import com.youlai.boot.framework.security.handler.MyAccessDeniedHandler; import com.youlai.boot.framework.security.handler.MyAuthenticationEntryPoint; import com.youlai.boot.framework.security.provider.SmsAuthenticationProvider; -import com.youlai.boot.framework.security.provider.WechatMiniAuthenticationProvider; +import com.youlai.boot.framework.security.provider.WxMaAuthenticationProvider; import com.youlai.boot.framework.security.token.TokenManager; import com.youlai.boot.framework.security.service.SysUserDetailsService; import com.youlai.boot.system.service.ConfigService; @@ -132,11 +132,11 @@ public class SecurityConfig { * 微信小程序认证 Provider */ @Bean - public WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider( + public WxMaAuthenticationProvider wechatMiniAuthenticationProvider( WxMaService wxMaService, SysUserDetailsService sysUserDetailsService ) { - return new WechatMiniAuthenticationProvider(wxMaService, sysUserDetailsService); + return new WxMaAuthenticationProvider(wxMaService, sysUserDetailsService); } /** @@ -146,7 +146,7 @@ public class SecurityConfig { public AuthenticationManager authenticationManager( DaoAuthenticationProvider daoAuthenticationProvider, SmsAuthenticationProvider smsAuthenticationProvider, - WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider + WxMaAuthenticationProvider wechatMiniAuthenticationProvider ) { return new ProviderManager( daoAuthenticationProvider, diff --git a/src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java b/src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java similarity index 76% rename from src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java rename to src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java index 9bd78bcd..584929ef 100644 --- a/src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java +++ b/src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java @@ -9,8 +9,11 @@ import java.util.Collection; /** * 微信小程序认证 Token + * + * @author Ray.Hao + * @since 4.0.0 */ -public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { +public class WxMaAuthenticationToken extends AbstractAuthenticationToken { @Serial private static final long serialVersionUID = 622L; @@ -34,7 +37,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { * * @param code 微信小程序code */ - public WechatMiniAuthenticationToken(String code) { + public WxMaAuthenticationToken(String code) { super(AuthorityUtils.NO_AUTHORITIES); this.principal = code; this.credentials = null; @@ -47,7 +50,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { * @param principal 用户详情（SysUserDetails） * @param authorities 授权信息 */ - public WechatMiniAuthenticationToken(Object principal, Collection authorities) { + public WxMaAuthenticationToken(Object principal, Collection authorities) { super(authorities); this.principal = principal; this.credentials = null; @@ -57,8 +60,8 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken { /** * 创建已认证的 Token（静态工厂方法） */ - public static WechatMiniAuthenticationToken authenticated(Object principal, Collection authorities) { - return new WechatMiniAuthenticationToken(principal, authorities); + public static WxMaAuthenticationToken authenticated(Object principal, Collection authorities) { + return new WxMaAuthenticationToken(principal, authorities); } @Override diff --git a/src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java b/src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java similarity index 91% rename from src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java rename to src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java index 8c7dd2c3..d30bfd60 100644 --- a/src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java +++ b/src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import com.youlai.boot.framework.security.exception.NeedBindMobileException; import com.youlai.boot.framework.security.model.SysUserDetails; import com.youlai.boot.framework.security.model.UserAuthInfo; -import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken; +import com.youlai.boot.framework.security.model.WxMaAuthenticationToken; import com.youlai.boot.framework.security.service.SysUserDetailsService; import com.youlai.boot.system.model.entity.UserSocial; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; */ @Slf4j @RequiredArgsConstructor -public class WechatMiniAuthenticationProvider implements AuthenticationProvider { +public class WxMaAuthenticationProvider implements AuthenticationProvider { private final WxMaService wxMaService; private final SysUserDetailsService sysUserDetailsService; @@ -76,7 +76,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider log.info("微信小程序登录成功：username={}, openid={}", userAuthInfo.getUsername(), openid); - return WechatMiniAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities()); + return WxMaAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities()); } catch (WxErrorException e) { log.error("微信小程序登录失败：调用微信接口异常，code={}", code, e); @@ -86,7 +86,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider @Override public boolean supports(Class authentication) { - return WechatMiniAuthenticationToken.class.isAssignableFrom(authentication); + return WxMaAuthenticationToken.class.isAssignableFrom(authentication); } } diff --git a/src/main/java/com/youlai/boot/module/sse/controller/SseController.java b/src/main/java/com/youlai/boot/message/controller/SseController.java similarity index 93% rename from src/main/java/com/youlai/boot/module/sse/controller/SseController.java rename to src/main/java/com/youlai/boot/message/controller/SseController.java index b1fa0490..f663c96b 100644 --- a/src/main/java/com/youlai/boot/module/sse/controller/SseController.java +++ b/src/main/java/com/youlai/boot/message/controller/SseController.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.sse.controller; +package com.youlai.boot.message.controller; import com.youlai.boot.common.result.Result; import com.youlai.boot.framework.security.model.SysUserDetails; import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.boot.module.sse.service.SseService; +import com.youlai.boot.message.service.SseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/module/sse/dto/DictChangeEvent.java b/src/main/java/com/youlai/boot/message/dto/DictChangeEvent.java similarity index 95% rename from src/main/java/com/youlai/boot/module/sse/dto/DictChangeEvent.java rename to src/main/java/com/youlai/boot/message/dto/DictChangeEvent.java index bdb5d906..934f2411 100644 --- a/src/main/java/com/youlai/boot/module/sse/dto/DictChangeEvent.java +++ b/src/main/java/com/youlai/boot/message/dto/DictChangeEvent.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.sse.dto; +package com.youlai.boot.message.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/sse/dto/OnlineUserDTO.java b/src/main/java/com/youlai/boot/message/dto/OnlineUserDTO.java similarity index 94% rename from src/main/java/com/youlai/boot/module/sse/dto/OnlineUserDTO.java rename to src/main/java/com/youlai/boot/message/dto/OnlineUserDTO.java index 0dac4ea3..57521550 100644 --- a/src/main/java/com/youlai/boot/module/sse/dto/OnlineUserDTO.java +++ b/src/main/java/com/youlai/boot/message/dto/OnlineUserDTO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.sse.dto; +package com.youlai.boot.message.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/sse/job/OnlineUserCountJob.java b/src/main/java/com/youlai/boot/message/job/OnlineUserCountJob.java similarity index 86% rename from src/main/java/com/youlai/boot/module/sse/job/OnlineUserCountJob.java rename to src/main/java/com/youlai/boot/message/job/OnlineUserCountJob.java index d446558f..14ecb42e 100644 --- a/src/main/java/com/youlai/boot/module/sse/job/OnlineUserCountJob.java +++ b/src/main/java/com/youlai/boot/message/job/OnlineUserCountJob.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.sse.job; +package com.youlai.boot.message.job; -import com.youlai.boot.module.sse.registry.SseSessionRegistry; -import com.youlai.boot.module.sse.service.SseService; +import com.youlai.boot.message.registry.SseSessionRegistry; +import com.youlai.boot.message.service.SseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/youlai/boot/module/sse/registry/SseSessionRegistry.java b/src/main/java/com/youlai/boot/message/registry/SseSessionRegistry.java similarity index 98% rename from src/main/java/com/youlai/boot/module/sse/registry/SseSessionRegistry.java rename to src/main/java/com/youlai/boot/message/registry/SseSessionRegistry.java index d31ad733..ecbbe3fc 100644 --- a/src/main/java/com/youlai/boot/module/sse/registry/SseSessionRegistry.java +++ b/src/main/java/com/youlai/boot/message/registry/SseSessionRegistry.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.sse.registry; +package com.youlai.boot.message.registry; -import com.youlai.boot.module.sse.dto.OnlineUserDTO; +import com.youlai.boot.message.dto.OnlineUserDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/src/main/java/com/youlai/boot/module/sse/service/SseService.java b/src/main/java/com/youlai/boot/message/service/SseService.java similarity index 93% rename from src/main/java/com/youlai/boot/module/sse/service/SseService.java rename to src/main/java/com/youlai/boot/message/service/SseService.java index 3aa1d157..d4b59f26 100644 --- a/src/main/java/com/youlai/boot/module/sse/service/SseService.java +++ b/src/main/java/com/youlai/boot/message/service/SseService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.sse.service; +package com.youlai.boot.message.service; -import com.youlai.boot.module.sse.dto.DictChangeEvent; -import com.youlai.boot.module.sse.dto.OnlineUserDTO; -import com.youlai.boot.module.sse.registry.SseSessionRegistry; -import com.youlai.boot.module.sse.topic.SseTopics; +import com.youlai.boot.message.dto.DictChangeEvent; +import com.youlai.boot.message.dto.OnlineUserDTO; +import com.youlai.boot.message.registry.SseSessionRegistry; +import com.youlai.boot.message.topic.SseTopics; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/sse/topic/SseTopics.java b/src/main/java/com/youlai/boot/message/topic/SseTopics.java similarity index 89% rename from src/main/java/com/youlai/boot/module/sse/topic/SseTopics.java rename to src/main/java/com/youlai/boot/message/topic/SseTopics.java index f2894278..0b48b51d 100644 --- a/src/main/java/com/youlai/boot/module/sse/topic/SseTopics.java +++ b/src/main/java/com/youlai/boot/message/topic/SseTopics.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.sse.topic; +package com.youlai.boot.message.topic; /** * SSE 主题常量 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 268cb2d7..ef55538d 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -17,7 +17,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.module.sse.service.SseService; +import com.youlai.boot.message.service.SseService; 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 124e0b5d..1429226c 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.module.codegen.model.entity.GenTable; +import com.youlai.boot.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; 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 9ea413df..088ae04a 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 @@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.codegen.model.entity.GenTable; +import com.youlai.boot.codegen.model.entity.GenTable; import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.system.converter.MenuConverter; import com.youlai.boot.system.mapper.MenuMapper; 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 a981ce7a..5052c03c 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.common.exception.BusinessException; -import com.youlai.boot.module.sse.dto.OnlineUserDTO; +import com.youlai.boot.message.dto.OnlineUserDTO; import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.system.converter.NoticeConverter; import com.youlai.boot.system.enums.NoticePublishStatusEnum; @@ -26,7 +26,7 @@ import com.youlai.boot.system.model.query.NoticeQuery; 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.module.sse.service.SseService; +import com.youlai.boot.message.service.SseService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/resources/mapper/codegen/DatabaseMapper.xml b/src/main/resources/mapper/codegen/DatabaseMapper.xml index e94646fc..32dd0600 100644 --- a/src/main/resources/mapper/codegen/DatabaseMapper.xml +++ b/src/main/resources/mapper/codegen/DatabaseMapper.xml @@ -3,10 +3,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - 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/main/resources/templates/codegen/frontend/ts/api.ts.vm b/src/main/resources/templates/codegen/frontend/ts/api.ts.vm index 5310fd82..3379e3eb 100644 --- a/src/main/resources/templates/codegen/frontend/ts/api.ts.vm +++ b/src/main/resources/templates/codegen/frontend/ts/api.ts.vm @@ -7,7 +7,7 @@ const ${entityName}API = { /** 获取${businessName}分页数据 */ getPage(queryParams?: ${entityName}QueryParams) { return request>({ - url: `${${entityUpperSnake}_BASE_URL}`, + url: \`\${${entityUpperSnake}_BASE_URL}\`, method: "get", params: queryParams, }); @@ -20,7 +20,7 @@ const ${entityName}API = { */ getFormData(id: string) { return request({ - url: `${${entityUpperSnake}_BASE_URL}/${id}/form`, + url: \`\${${entityUpperSnake}_BASE_URL}/\${id}/form\`, method: "get", }); }, @@ -32,7 +32,7 @@ const ${entityName}API = { */ create(data: ${entityName}Form) { return request({ - url: `${${entityUpperSnake}_BASE_URL}`, + url: \`\${${entityUpperSnake}_BASE_URL}\`, method: "post", data, }); @@ -46,7 +46,7 @@ const ${entityName}API = { */ update(id: string, data: ${entityName}Form) { return request({ - url: `${${entityUpperSnake}_BASE_URL}/${id}`, + url: \`\${${entityUpperSnake}_BASE_URL}/\${id}\`, method: "put", data, }); @@ -59,7 +59,7 @@ const ${entityName}API = { */ deleteByIds(ids: string) { return request({ - url: `${${entityUpperSnake}_BASE_URL}/${ids}`, + url: \`\${${entityUpperSnake}_BASE_URL}/\${ids}\`, method: "delete", }); }