From 77fc3d37d8955f80a72a1c25593b415b83ee04a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 24 Mar 2026 10:49:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- .../dromara/generator/config/GenConfig.java | 45 ------------------- .../config/properties/GenProperties.java | 5 +++ .../org/dromara/generator/util/GenUtils.java | 15 ++++--- .../generator/util/TemplateEngineUtils.java | 6 ++- ...ot.autoconfigure.AutoConfiguration.imports | 1 - 6 files changed, 19 insertions(+), 57 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java delete mode 100644 ruoyi-modules/ruoyi-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/README.md b/README.md index f1b44adfe..46302b951 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Topiam IAM/IDaaS身份管理平台 - https://www.topiam.cn/
| 邮件 | 采用 mail-api 通用协议支持大部分邮件厂商 | 不支持 | | 接口文档 | 采用 SpringDoc、javadoc 无注解零入侵基于java注释
只需把注释写好 无需再写一大堆的文档注解了 | 采用 Springfox 已停止维护 需要编写大量的注解来支持文档生成 | | 校验框架 | 采用 Validation 支持注解与工具类校验 注解支持国际化 | 仅支持注解 且注解不支持国际化 | -| Excel框架 | 采用 FastExcel(原Alibaba EasyExcel) 基于插件化
框架对其增加了很多功能 例如 自动合并相同内容 自动排列布局 字典翻译等 | 基于 POI 手写实现 功能有限 复杂 扩展性差 | +| Excel框架 | 采用 Apache Fesod(原Alibaba EasyExcel) 基于插件化
框架对其增加了很多功能 例如 自动合并相同内容 自动排列布局 字典翻译等 | 基于 POI 手写实现 功能有限 复杂 扩展性差 | | 工作流支持 | 采用 WarmFlow 支持各种复杂审批 转办 委派 加减签 会签 或签 票签 等功能 | 无 | | 工具类框架 | 采用 Hutool、Lombok 上百种工具覆盖90%的使用需求 基于注解自动生成 get set 等简化框架大量代码 | 手写工具稳定性差易出问题 工具数量有限 代码臃肿需自己手写 get set 等 | | 监控框架 | 采用 SpringBoot-Admin 基于SpringBoot官方 actuator 探针机制
实时监控服务状态 框架还为其扩展了在线日志查看监控 | 无 | @@ -97,8 +97,6 @@ Topiam IAM/IDaaS身份管理平台 - https://www.topiam.cn/
| 业务 | 功能说明 | 本框架 | RuoYi | |--------|----------------------------------------------------------------------|-----|------------------| -| 租户管理 | 系统内租户的管理 如:租户套餐、过期时间、用户数量、企业信息等 | 支持 | 无 | -| 租户套餐管理 | 系统内租户所能使用的套餐管理 如:套餐内所包含的菜单等 | 支持 | 无 | | 客户端管理 | 系统内对接的所有客户端管理 如: pc端、小程序端等
支持动态授权登录方式 如: 短信登录、密码登录等 支持动态控制token时效 | 支持 | 无 | | 用户管理 | 用户的管理配置 如:新增用户、分配用户所属部门、角色、岗位等 | 支持 | 支持 | | 部门管理 | 配置系统组织机构（公司、部门、小组） 树结构展现支持数据权限 | 支持 | 支持 | diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java deleted file mode 100644 index 764b8db38..000000000 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.dromara.generator.config; - -import cn.hutool.extra.template.TemplateConfig; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.generator.config.properties.GenProperties; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.PropertySource; - -/** - * 读取代码生成相关配置 - * - * @author ruoyi - */ -@AutoConfiguration -@EnableConfigurationProperties(GenProperties.class) -@PropertySource(value = "classpath:generator.yml", factory = YmlPropertySourceFactory.class) -public class GenConfig { - - private static GenProperties genProperties; - - public GenConfig(GenProperties genProperties) { - GenConfig.genProperties = genProperties; - } - - public static String getAuthor() { - return genProperties.getAuthor(); - } - - public static String getPackageName() { - return genProperties.getPackageName(); - } - - public static boolean getAutoRemovePre() { - return genProperties.isAutoRemovePre(); - } - - public static String getTablePrefix() { - return genProperties.getTablePrefix(); - } - - public static TemplateConfig getTemplateConfig() { - return genProperties.getTemplateConfig(); - } -} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java index 0e24ccfbc..60071a303 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java @@ -2,7 +2,10 @@ package org.dromara.generator.config.properties; import cn.hutool.extra.template.TemplateConfig; import lombok.Data; +import org.dromara.common.core.factory.YmlPropertySourceFactory; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; import java.nio.charset.StandardCharsets; @@ -12,7 +15,9 @@ import java.nio.charset.StandardCharsets; * @author 秋辞未寒 */ @Data +@Component @ConfigurationProperties(prefix = "gen") +@PropertySource(value = "classpath:generator.yml", factory = YmlPropertySourceFactory.class) public class GenProperties { /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java index d24dfc0f5..cc047c146 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java @@ -3,8 +3,9 @@ package org.dromara.generator.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; +import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.generator.config.GenConfig; +import org.dromara.generator.config.properties.GenProperties; import org.dromara.generator.constant.GenConstants; import org.dromara.generator.domain.GenTable; import org.dromara.generator.domain.GenTableColumn; @@ -19,6 +20,8 @@ import java.util.Arrays; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class GenUtils { + private final static GenProperties PROPERTIES = SpringUtils.getBean(GenProperties.class); + /** * 初始化表信息 * @@ -26,11 +29,11 @@ public class GenUtils { */ public static void initTable(GenTable genTable) { genTable.setClassName(convertClassName(genTable.getTableName())); - genTable.setPackageName(GenConfig.getPackageName()); - genTable.setModuleName(getModuleName(GenConfig.getPackageName())); + genTable.setPackageName(PROPERTIES.getPackageName()); + genTable.setModuleName(getModuleName(PROPERTIES.getPackageName())); genTable.setBusinessName(getBusinessName(genTable.getTableName())); genTable.setFunctionName(replaceText(genTable.getTableComment())); - genTable.setFunctionAuthor(GenConfig.getAuthor()); + genTable.setFunctionAuthor(PROPERTIES.getAuthor()); genTable.setCreateTime(null); genTable.setUpdateTime(null); } @@ -157,8 +160,8 @@ public class GenUtils { * @return 类名 */ public static String convertClassName(String tableName) { - boolean autoRemovePre = GenConfig.getAutoRemovePre(); - String tablePrefix = GenConfig.getTablePrefix(); + boolean autoRemovePre = PROPERTIES.isAutoRemovePre(); + String tablePrefix = PROPERTIES.getTablePrefix(); if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) { String[] searchList = StringUtils.split(tablePrefix, StringUtils.SEPARATOR); tableName = replaceFirst(tableName, searchList); diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java index 113b1277a..bbda0a6e5 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java @@ -9,11 +9,12 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.enums.DataBaseType; import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.generator.config.GenConfig; +import org.dromara.generator.config.properties.GenProperties; import org.dromara.generator.constant.GenConstants; import org.dromara.generator.domain.GenTable; import org.dromara.generator.domain.GenTableColumn; @@ -52,7 +53,8 @@ public class TemplateEngineUtils { static { // 模板引擎初始化 - TEMPLATE_ENGINE = TemplateUtil.createEngine(GenConfig.getTemplateConfig()); + GenProperties properties = SpringUtils.getBean(GenProperties.class); + TEMPLATE_ENGINE = TemplateUtil.createEngine(properties.getTemplateConfig()); TEMPLATE_MAPPER = PathNamedTemplate.form(TEMPLATE_ENGINE, GenConstants.TEMPLATE_PATHS); } diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index abd2aee9d..000000000 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.generator.config.GenConfig