From cee572f237cb293e4a9070ef458356bc6daa2105 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 19 七月 2020 10:25:40 +0800
Subject: [PATCH] 若依 3.0
---
ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
similarity index 76%
rename from ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java
rename to ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
index a74e2c3..1b144de 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
@@ -1,6 +1,8 @@
-package com.ruoyi.framework.config;
+package com.ruoyi.generator.config;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
/**
@@ -10,6 +12,7 @@
*/
@Component
@ConfigurationProperties(prefix = "gen")
+@PropertySource(value = { "classpath:generator.yml" })
public class GenConfig
{
/** 作者 */
@@ -18,7 +21,7 @@
/** 生成包路径 */
public static String packageName;
- /** 自动去除表前缀，默认是true */
+ /** 自动去除表前缀，默认是false */
public static boolean autoRemovePre;
/** 表前缀(类名不会包含表前缀) */
@@ -29,6 +32,7 @@
return author;
}
+ @Value("${author}")
public void setAuthor(String author)
{
GenConfig.author = author;
@@ -39,6 +43,7 @@
return packageName;
}
+ @Value("${packageName}")
public void setPackageName(String packageName)
{
GenConfig.packageName = packageName;
@@ -49,6 +54,7 @@
return autoRemovePre;
}
+ @Value("${autoRemovePre}")
public void setAutoRemovePre(boolean autoRemovePre)
{
GenConfig.autoRemovePre = autoRemovePre;
@@ -59,6 +65,7 @@
return tablePrefix;
}
+ @Value("${tablePrefix}")
public void setTablePrefix(String tablePrefix)
{
GenConfig.tablePrefix = tablePrefix;
--
Gitblit v1.9.2