diff --git a/zheng-common/src/main/java/com/zheng/common/plugin/EncryptPropertyPlaceholderConfigurer.java b/zheng-common/src/main/java/com/zheng/common/plugin/EncryptPropertyPlaceholderConfigurer.java index 8b841171622d9a2be353ce4925ed659496b29df3..69b2be83f62faa11d765e2a6596263a4555e6766 100644 --- a/zheng-common/src/main/java/com/zheng/common/plugin/EncryptPropertyPlaceholderConfigurer.java +++ b/zheng-common/src/main/java/com/zheng/common/plugin/EncryptPropertyPlaceholderConfigurer.java @@ -10,7 +10,7 @@ import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; public class EncryptPropertyPlaceholderConfigurer extends PropertyPlaceholderConfigurer { private String[] propertyNames = { - "master.jdbc.password", "slave.jdbc.password", "master.redis.password" + "master.jdbc.password", "slave.jdbc.password", "generator.jdbc.password", "master.redis.password" }; /** diff --git a/zheng-common/src/main/java/com/zheng/common/util/MybatisGeneratorUtil.java b/zheng-common/src/main/java/com/zheng/common/util/MybatisGeneratorUtil.java index fd50d556959fd9c6af4be3c8df9d2762d25040ef..d159843a15d50e608dc60b1dc8cb58fc1ddee579 100644 --- a/zheng-common/src/main/java/com/zheng/common/util/MybatisGeneratorUtil.java +++ b/zheng-common/src/main/java/com/zheng/common/util/MybatisGeneratorUtil.java @@ -74,6 +74,7 @@ public class MybatisGeneratorUtil { System.out.println("========== 开始运行MybatisGenerator =========="); // 生成代码 try { + Thread.sleep(2000); List warnings = new ArrayList<>(); File configFile = new File(MybatisGeneratorUtil.class.getResource("/generatorConfig.xml").getFile()); ConfigurationParser cp = new ConfigurationParser(warnings);