update 优化 删除无用配置代码

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java

@@ -1,14 +1,11 @@
 package org.dromara.gen.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;
-
 /**
  * 代码生成配置属性
  *
@@ -40,9 +37,4 @@ public class GenProperties {
      */
     private String tablePrefix;
 
-    /**
-     * 模板配置
-     */
-    private TemplateConfig templateConfig = new TemplateConfig(StandardCharsets.UTF_8, null, TemplateConfig.ResourceMode.CLASSPATH);
-
 }

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import cn.hutool.extra.template.engine.freemarker.FreemarkerEngine;
@@ -12,12 +13,10 @@ import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 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.gen.config.properties.GenProperties;
 import org.dromara.gen.constant.GenConstants;
 import org.dromara.gen.domain.GenTable;
 import org.dromara.gen.domain.GenTableColumn;
@@ -27,6 +26,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.function.Consumer;
 
@@ -59,9 +59,9 @@ public class TemplateEngineUtils {
 
     static {
         // 模板引擎初始化
-        GenProperties properties = SpringUtils.getBean(GenProperties.class);
+        TemplateConfig templateConfig = new TemplateConfig(StandardCharsets.UTF_8, StringUtils.EMPTY, TemplateConfig.ResourceMode.CLASSPATH);
-        properties.getTemplateConfig().setCustomEngine(FreemarkerEngine.class);
+        templateConfig.setCustomEngine(FreemarkerEngine.class);
-        TEMPLATE_ENGINE = TemplateUtil.createEngine(properties.getTemplateConfig());
+        TEMPLATE_ENGINE = TemplateUtil.createEngine(templateConfig);
         TEMPLATE_MAPPER = PathNamedTemplate.form(TEMPLATE_ENGINE, GenConstants.TEMPLATE_PATHS);
     }
 

ruoyi-modules/ruoyi-gen/src/main/resources/generator.yml

@@ -8,9 +8,3 @@ gen:
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
   tablePrefix: sys_
-  # 模板配置
-  templateConfig:
-    # 模版加载模式
-    resourceMode: CLASSPATH
-    # 模板加载路径
-    # path: fm