diff --git a/src/main/java/com/youlai/boot/YouLaiApplication.java b/src/main/java/com/youlai/boot/YouLaiBootApplication.java similarity index 82% rename from src/main/java/com/youlai/boot/YouLaiApplication.java rename to src/main/java/com/youlai/boot/YouLaiBootApplication.java index e891cb5b..a489aa87 100644 --- a/src/main/java/com/youlai/boot/YouLaiApplication.java +++ b/src/main/java/com/youlai/boot/YouLaiBootApplication.java @@ -14,10 +14,10 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @ConfigurationPropertiesScan @EnableScheduling -public class YouLaiApplication { +public class YouLaiBootApplication { public static void main(String[] args) { - SpringApplication.run(YouLaiApplication.class, args); + SpringApplication.run(YouLaiBootApplication.class, args); } } diff --git a/src/main/java/com/youlai/boot/common/model/KeyValue.java b/src/main/java/com/youlai/boot/common/model/KeyValue.java index 9d8ec18c..2e33be82 100644 --- a/src/main/java/com/youlai/boot/common/model/KeyValue.java +++ b/src/main/java/com/youlai/boot/common/model/KeyValue.java @@ -1,32 +1,30 @@ package com.youlai.boot.common.model; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; /** - * 下拉选项对象 + * 键值对 * * @author haoxr * @since 2024/5/25 */ -@Schema(description ="键值对") +@Schema(description = "键值对") @Data @NoArgsConstructor -public class KeyValue{ +public class KeyValue { public KeyValue(String key, String value) { this.key = key; this.value = value; } - @Schema(description="选项的值") + @Schema(description = "选项的值") private String key; - @Schema(description="选项的标签") + @Schema(description = "选项的标签") private String value; } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java deleted file mode 100644 index cfa3c551..00000000 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/DatabaseMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.youlai.boot.module.codegen.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.module.codegen.model.bo.TableMetaData; -import com.youlai.boot.module.codegen.model.query.TablePageQuery; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -@Mapper -public interface DatabaseMapper extends BaseMapper { - - - Page getTablePage(Page page, TablePageQuery queryParams); - - List getTableColumns(String tableName); - - TableMetaData getTableMetadata(String tableName); -} diff --git a/src/main/java/com/youlai/boot/modules/member/controller/MemberController.java b/src/main/java/com/youlai/boot/modules/member/controller/MemberController.java new file mode 100644 index 00000000..1512905e --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/member/controller/MemberController.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.member.controller; + +/** + * 会员控制层-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class MemberController { +} diff --git a/src/main/java/com/youlai/boot/modules/member/mapper/MemberMapper.java b/src/main/java/com/youlai/boot/modules/member/mapper/MemberMapper.java new file mode 100644 index 00000000..59be608e --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/member/mapper/MemberMapper.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.member.mapper; + +/** + * 会员数据访问层-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class MemberMapper { +} diff --git a/src/main/java/com/youlai/boot/modules/member/model/Member.java b/src/main/java/com/youlai/boot/modules/member/model/Member.java new file mode 100644 index 00000000..c75fda6f --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/member/model/Member.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.member.model; + +/** + * 会员实体-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class Member { +} diff --git a/src/main/java/com/youlai/boot/modules/member/service/MemberService.java b/src/main/java/com/youlai/boot/modules/member/service/MemberService.java new file mode 100644 index 00000000..49a8a733 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/member/service/MemberService.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.member.service; + +/** + * 会员管理服务类-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class MemberService { +} diff --git a/src/main/java/com/youlai/boot/modules/order/controller/OrderController.java b/src/main/java/com/youlai/boot/modules/order/controller/OrderController.java new file mode 100644 index 00000000..4c009b67 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/order/controller/OrderController.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.order.controller; + +/** + * 订单控制层-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class OrderController { +} diff --git a/src/main/java/com/youlai/boot/modules/order/mapper/OrderMapper.java b/src/main/java/com/youlai/boot/modules/order/mapper/OrderMapper.java new file mode 100644 index 00000000..c6f0c108 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/order/mapper/OrderMapper.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.order.mapper; + +/** + * 订单数据访问层-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class OrderMapper { +} diff --git a/src/main/java/com/youlai/boot/modules/order/model/Order.java b/src/main/java/com/youlai/boot/modules/order/model/Order.java new file mode 100644 index 00000000..cd1b00ac --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/order/model/Order.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.order.model; + +/** + * 订单实体-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class Order { +} diff --git a/src/main/java/com/youlai/boot/modules/order/service/OrderService.java b/src/main/java/com/youlai/boot/modules/order/service/OrderService.java new file mode 100644 index 00000000..0341bce7 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/order/service/OrderService.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.order.service; + +/** + * 订单管理服务类-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class OrderService { +} diff --git a/src/main/java/com/youlai/boot/modules/product/controller/ProductController.java b/src/main/java/com/youlai/boot/modules/product/controller/ProductController.java new file mode 100644 index 00000000..480b993c --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/product/controller/ProductController.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.product.controller; + +/** + * 商品控制层-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class ProductController { +} diff --git a/src/main/java/com/youlai/boot/modules/product/mapper/ProductMapper.java b/src/main/java/com/youlai/boot/modules/product/mapper/ProductMapper.java new file mode 100644 index 00000000..52068175 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/product/mapper/ProductMapper.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.product.mapper; + +/** + * 商品数据访问层-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class ProductMapper { +} diff --git a/src/main/java/com/youlai/boot/modules/product/model/Product.java b/src/main/java/com/youlai/boot/modules/product/model/Product.java new file mode 100644 index 00000000..6b746889 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/product/model/Product.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.product.model; + +/** + * 商品实体-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class Product { +} diff --git a/src/main/java/com/youlai/boot/modules/product/service/ProductService.java b/src/main/java/com/youlai/boot/modules/product/service/ProductService.java new file mode 100644 index 00000000..27929770 --- /dev/null +++ b/src/main/java/com/youlai/boot/modules/product/service/ProductService.java @@ -0,0 +1,10 @@ +package com.youlai.boot.modules.product.service; + +/** + * 会员管理服务类-业务模块演示 + * + * @author haoxr + * @since 2024/10/10 + */ +public class ProductService { +} diff --git a/src/main/java/com/youlai/boot/module/auth/controller/AuthController.java b/src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java similarity index 94% rename from src/main/java/com/youlai/boot/module/auth/controller/AuthController.java rename to src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java index 4e3f7825..2d191c2c 100644 --- a/src/main/java/com/youlai/boot/module/auth/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.auth.controller; +package com.youlai.boot.shared.auth.controller; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.result.Result; -import com.youlai.boot.module.auth.service.AuthService; +import com.youlai.boot.shared.auth.service.AuthService; import com.youlai.boot.system.model.dto.CaptchaResult; import com.youlai.boot.system.model.dto.LoginResult; import com.youlai.boot.common.annotation.Log; diff --git a/src/main/java/com/youlai/boot/module/auth/enums/CaptchaTypeEnum.java b/src/main/java/com/youlai/boot/shared/auth/enums/CaptchaTypeEnum.java similarity index 88% rename from src/main/java/com/youlai/boot/module/auth/enums/CaptchaTypeEnum.java rename to src/main/java/com/youlai/boot/shared/auth/enums/CaptchaTypeEnum.java index 1a0ec96f..b2f1dd4e 100644 --- a/src/main/java/com/youlai/boot/module/auth/enums/CaptchaTypeEnum.java +++ b/src/main/java/com/youlai/boot/shared/auth/enums/CaptchaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.auth.enums; +package com.youlai.boot.shared.auth.enums; /** * EasyCaptcha 验证码类型枚举 diff --git a/src/main/java/com/youlai/boot/module/auth/service/AuthService.java b/src/main/java/com/youlai/boot/shared/auth/service/AuthService.java similarity index 92% rename from src/main/java/com/youlai/boot/module/auth/service/AuthService.java rename to src/main/java/com/youlai/boot/shared/auth/service/AuthService.java index aa020e52..57a42caa 100644 --- a/src/main/java/com/youlai/boot/module/auth/service/AuthService.java +++ b/src/main/java/com/youlai/boot/shared/auth/service/AuthService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.auth.service; +package com.youlai.boot.shared.auth.service; import com.youlai.boot.system.model.dto.CaptchaResult; import com.youlai.boot.system.model.dto.LoginResult; diff --git a/src/main/java/com/youlai/boot/module/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java similarity index 97% rename from src/main/java/com/youlai/boot/module/auth/service/impl/AuthServiceImpl.java rename to src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java index b1ee363c..91f5a3f0 100644 --- a/src/main/java/com/youlai/boot/module/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.auth.service.impl; +package com.youlai.boot.shared.auth.service.impl; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CaptchaUtil; @@ -9,8 +9,8 @@ import cn.hutool.json.JSONObject; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.boot.common.constant.SecurityConstants; -import com.youlai.boot.module.auth.enums.CaptchaTypeEnum; -import com.youlai.boot.module.auth.service.AuthService; +import com.youlai.boot.shared.auth.enums.CaptchaTypeEnum; +import com.youlai.boot.shared.auth.service.AuthService; import com.youlai.boot.system.model.dto.CaptchaResult; import com.youlai.boot.system.model.dto.LoginResult; import com.youlai.boot.config.property.CaptchaProperties; diff --git a/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/shared/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/shared/codegen/controller/CodegenController.java index f247913a..50119908 100644 --- a/src/main/java/com/youlai/boot/module/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java @@ -1,17 +1,17 @@ -package com.youlai.boot.module.codegen.controller; +package com.youlai.boot.shared.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.config.property.CodegenProperties; 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.TablePageQuery; -import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.shared.codegen.service.CodegenService; +import com.youlai.boot.shared.codegen.model.form.GenConfigForm; +import com.youlai.boot.shared.codegen.model.query.TablePageQuery; +import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.shared.codegen.model.vo.TablePageVO; import com.youlai.boot.common.annotation.Log; -import com.youlai.boot.module.codegen.service.GenConfigService; +import com.youlai.boot.shared.codegen.service.GenConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -32,7 +32,7 @@ import java.util.List; * @author Ray * @since 2.10.0 */ -@Tag(name = "09.代码生成") +@Tag(name = "11.代码生成") @RestController @RequestMapping("/api/v1/codegen") @RequiredArgsConstructor diff --git a/src/main/java/com/youlai/boot/module/codegen/converter/CodegenConverter.java b/src/main/java/com/youlai/boot/shared/codegen/converter/CodegenConverter.java similarity index 83% rename from src/main/java/com/youlai/boot/module/codegen/converter/CodegenConverter.java rename to src/main/java/com/youlai/boot/shared/codegen/converter/CodegenConverter.java index 083e343e..0508ff99 100644 --- a/src/main/java/com/youlai/boot/module/codegen/converter/CodegenConverter.java +++ b/src/main/java/com/youlai/boot/shared/codegen/converter/CodegenConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.codegen.converter; +package com.youlai.boot.shared.codegen.converter; -import com.youlai.boot.module.codegen.model.entity.GenConfig; -import com.youlai.boot.module.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; +import com.youlai.boot.shared.codegen.model.entity.GenConfig; +import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.shared.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/shared/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/shared/codegen/enums/FormTypeEnum.java index 4e271e1d..4c3a2ecb 100644 --- a/src/main/java/com/youlai/boot/module/codegen/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.enums; +package com.youlai.boot.shared.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/shared/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/shared/codegen/enums/JavaTypeEnum.java index f6f89f58..a5a4bf73 100644 --- a/src/main/java/com/youlai/boot/module/codegen/enums/JavaTypeEnum.java +++ b/src/main/java/com/youlai/boot/shared/codegen/enums/JavaTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.enums; +package com.youlai.boot.shared.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/shared/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/shared/codegen/enums/QueryTypeEnum.java index 5e665ed7..cd2d52b4 100644 --- a/src/main/java/com/youlai/boot/module/codegen/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/shared/codegen/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.enums; +package com.youlai.boot.shared.codegen.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/main/java/com/youlai/boot/shared/codegen/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/shared/codegen/mapper/DatabaseMapper.java new file mode 100644 index 00000000..1a54cdb2 --- /dev/null +++ b/src/main/java/com/youlai/boot/shared/codegen/mapper/DatabaseMapper.java @@ -0,0 +1,47 @@ +package com.youlai.boot.shared.codegen.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.boot.shared.codegen.model.bo.ColumnMetaData; +import com.youlai.boot.shared.codegen.model.bo.TableMetaData; +import com.youlai.boot.shared.codegen.model.query.TablePageQuery; +import com.youlai.boot.shared.codegen.model.vo.TablePageVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +/** + * 数据库映射层 + * + * @author Ray + * @since 2.9.0 + */ +@Mapper +public interface DatabaseMapper extends BaseMapper { + + /** + * 获取表分页列表 + * + * @param page + * @param queryParams + * @return + */ + Page getTablePage(Page page, TablePageQuery queryParams); + + /** + * 获取表字段列表 + * + * @param tableName + * @return + */ + List getTableColumns(String tableName); + + /** + * 获取表元数据 + * + * @param tableName + * @return + */ + TableMetaData getTableMetadata(String tableName); +} diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/GenConfigMapper.java b/src/main/java/com/youlai/boot/shared/codegen/mapper/GenConfigMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/codegen/mapper/GenConfigMapper.java rename to src/main/java/com/youlai/boot/shared/codegen/mapper/GenConfigMapper.java index 282b6fd9..a33aa22a 100644 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/GenConfigMapper.java +++ b/src/main/java/com/youlai/boot/shared/codegen/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.mapper; +package com.youlai.boot.shared.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.codegen.model.entity.GenConfig; +import com.youlai.boot.shared.codegen.model.entity.GenConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/codegen/mapper/GenFieldConfigMapper.java b/src/main/java/com/youlai/boot/shared/codegen/mapper/GenFieldConfigMapper.java similarity index 71% rename from src/main/java/com/youlai/boot/module/codegen/mapper/GenFieldConfigMapper.java rename to src/main/java/com/youlai/boot/shared/codegen/mapper/GenFieldConfigMapper.java index 0d663d0f..de54ec3e 100644 --- a/src/main/java/com/youlai/boot/module/codegen/mapper/GenFieldConfigMapper.java +++ b/src/main/java/com/youlai/boot/shared/codegen/mapper/GenFieldConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.mapper; +package com.youlai.boot.shared.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java similarity index 94% rename from src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java index ed40149a..05cb8591 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.bo; +package com.youlai.boot.shared.codegen.model.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/shared/codegen/model/bo/TableMetaData.java similarity index 91% rename from src/main/java/com/youlai/boot/module/codegen/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/shared/codegen/model/bo/TableMetaData.java index 028bbfb8..0f8a18bc 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.bo; +package com.youlai.boot.shared.codegen.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenConfig.java b/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenConfig.java similarity index 93% rename from src/main/java/com/youlai/boot/module/codegen/model/entity/GenConfig.java rename to src/main/java/com/youlai/boot/shared/codegen/model/entity/GenConfig.java index c6144550..7fddaf12 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.entity; +package com.youlai.boot.shared.codegen.model.entity; import com.baomidou.mybatisplus.annotation.*; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java similarity index 90% rename from src/main/java/com/youlai/boot/module/codegen/model/entity/GenFieldConfig.java rename to src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java index c67a2436..64fc6eaf 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/entity/GenFieldConfig.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.codegen.model.entity; +package com.youlai.boot.shared.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.shared.codegen.enums.FormTypeEnum; +import com.youlai.boot.shared.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/shared/codegen/model/form/GenConfigForm.java similarity index 93% rename from src/main/java/com/youlai/boot/module/codegen/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/shared/codegen/model/form/GenConfigForm.java index 19e3f71d..2893788d 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/form/GenConfigForm.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.model.form; +package com.youlai.boot.shared.codegen.model.form; -import com.youlai.boot.module.codegen.enums.FormTypeEnum; -import com.youlai.boot.module.codegen.enums.QueryTypeEnum; +import com.youlai.boot.shared.codegen.enums.FormTypeEnum; +import com.youlai.boot.shared.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/shared/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/shared/codegen/model/query/TablePageQuery.java index 4360ff2c..f44cd8a3 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/query/TablePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.query; +package com.youlai.boot.shared.codegen.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/boot/module/codegen/model/vo/CodegenPreviewVO.java b/src/main/java/com/youlai/boot/shared/codegen/model/vo/CodegenPreviewVO.java similarity index 89% rename from src/main/java/com/youlai/boot/module/codegen/model/vo/CodegenPreviewVO.java rename to src/main/java/com/youlai/boot/shared/codegen/model/vo/CodegenPreviewVO.java index 959bd1a4..2b8e1a71 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/vo/CodegenPreviewVO.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/vo/CodegenPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.vo; +package com.youlai.boot.shared.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/TablePageVO.java b/src/main/java/com/youlai/boot/shared/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/shared/codegen/model/vo/TablePageVO.java index 369f2409..30ff28b8 100644 --- a/src/main/java/com/youlai/boot/module/codegen/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/shared/codegen/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.model.vo; +package com.youlai.boot.shared.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/shared/codegen/service/CodegenService.java similarity index 69% rename from src/main/java/com/youlai/boot/module/codegen/service/CodegenService.java rename to src/main/java/com/youlai/boot/shared/codegen/service/CodegenService.java index 5ac387c7..ce48fde3 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/CodegenService.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/CodegenService.java @@ -1,10 +1,9 @@ -package com.youlai.boot.module.codegen.service; +package com.youlai.boot.shared.codegen.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; -import com.youlai.boot.module.codegen.model.query.TablePageQuery; -import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.shared.codegen.model.query.TablePageQuery; +import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.shared.codegen.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/codegen/service/GenConfigService.java b/src/main/java/com/youlai/boot/shared/codegen/service/GenConfigService.java similarity index 79% rename from src/main/java/com/youlai/boot/module/codegen/service/GenConfigService.java rename to src/main/java/com/youlai/boot/shared/codegen/service/GenConfigService.java index 93f0187f..9b039b2c 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/GenConfigService.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/GenConfigService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.codegen.service; +package com.youlai.boot.shared.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.codegen.model.entity.GenConfig; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; +import com.youlai.boot.shared.codegen.model.entity.GenConfig; +import com.youlai.boot.shared.codegen.model.form.GenConfigForm; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/module/codegen/service/GenFieldConfigService.java b/src/main/java/com/youlai/boot/shared/codegen/service/GenFieldConfigService.java similarity index 65% rename from src/main/java/com/youlai/boot/module/codegen/service/GenFieldConfigService.java rename to src/main/java/com/youlai/boot/shared/codegen/service/GenFieldConfigService.java index 6e9c0407..5433da03 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/GenFieldConfigService.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/GenFieldConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.codegen.service; +package com.youlai.boot.shared.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java similarity index 94% rename from src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java rename to src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java index 56f11acc..f78bc304 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/impl/CodegenServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.codegen.service.impl; +package com.youlai.boot.shared.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -10,18 +10,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.shared.codegen.enums.JavaTypeEnum; import com.youlai.boot.config.property.CodegenProperties; -import com.youlai.boot.module.codegen.service.GenConfigService; -import com.youlai.boot.module.codegen.service.GenFieldConfigService; -import com.youlai.boot.module.codegen.service.CodegenService; +import com.youlai.boot.shared.codegen.service.GenConfigService; +import com.youlai.boot.shared.codegen.service.GenFieldConfigService; +import com.youlai.boot.shared.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.GenConfig; -import com.youlai.boot.module.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.module.codegen.model.query.TablePageQuery; -import com.youlai.boot.module.codegen.model.vo.CodegenPreviewVO; -import com.youlai.boot.module.codegen.model.vo.TablePageVO; +import com.youlai.boot.shared.codegen.mapper.DatabaseMapper; +import com.youlai.boot.shared.codegen.model.entity.GenConfig; +import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.shared.codegen.model.query.TablePageQuery; +import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; +import com.youlai.boot.shared.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/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java similarity index 89% rename from src/main/java/com/youlai/boot/module/codegen/service/impl/GenConfigServiceImpl.java rename to src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java index a937cfc6..971f38c9 100644 --- a/src/main/java/com/youlai/boot/module/codegen/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java @@ -1,27 +1,27 @@ -package com.youlai.boot.module.codegen.service.impl; +package com.youlai.boot.shared.codegen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.YouLaiApplication; +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.shared.codegen.enums.FormTypeEnum; +import com.youlai.boot.shared.codegen.enums.JavaTypeEnum; +import com.youlai.boot.shared.codegen.enums.QueryTypeEnum; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.config.property.CodegenProperties; -import com.youlai.boot.module.codegen.converter.CodegenConverter; -import com.youlai.boot.module.codegen.mapper.DatabaseMapper; -import com.youlai.boot.module.codegen.mapper.GenConfigMapper; -import com.youlai.boot.module.codegen.model.bo.ColumnMetaData; -import com.youlai.boot.module.codegen.model.bo.TableMetaData; -import com.youlai.boot.module.codegen.model.entity.GenConfig; -import com.youlai.boot.module.codegen.model.entity.GenFieldConfig; -import com.youlai.boot.module.codegen.model.form.GenConfigForm; -import com.youlai.boot.module.codegen.service.GenConfigService; -import com.youlai.boot.module.codegen.service.GenFieldConfigService; +import com.youlai.boot.shared.codegen.converter.CodegenConverter; +import com.youlai.boot.shared.codegen.mapper.DatabaseMapper; +import com.youlai.boot.shared.codegen.mapper.GenConfigMapper; +import com.youlai.boot.shared.codegen.model.bo.ColumnMetaData; +import com.youlai.boot.shared.codegen.model.bo.TableMetaData; +import com.youlai.boot.shared.codegen.model.entity.GenConfig; +import com.youlai.boot.shared.codegen.model.entity.GenFieldConfig; +import com.youlai.boot.shared.codegen.model.form.GenConfigForm; +import com.youlai.boot.shared.codegen.service.GenConfigService; +import com.youlai.boot.shared.codegen.service.GenFieldConfigService; import com.youlai.boot.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -86,7 +86,7 @@ public class GenConfigServiceImpl extends ServiceImpl - + - SELECT t1.TABLE_NAME , t1.TABLE_COMMENT , @@ -33,7 +33,7 @@ CREATE_TIME DESC - SELECT TABLE_NAME , TABLE_COMMENT , @@ -47,7 +47,7 @@ AND TABLE_NAME = #{tableName} - SELECT COLUMN_NAME, DATA_TYPE, diff --git a/src/main/resources/mapper/codegen/GenConfigMapper.xml b/src/main/resources/mapper/codegen/GenConfigMapper.xml index dde77481..996587bd 100644 --- a/src/main/resources/mapper/codegen/GenConfigMapper.xml +++ b/src/main/resources/mapper/codegen/GenConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml b/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml index 44fb3976..287e9634 100644 --- a/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml +++ b/src/main/resources/mapper/codegen/GenFieldConfigMapper.xml @@ -2,6 +2,6 @@ - +