From 6d8b8a9c7ffddfab0cd90fb9e26875b6ddc95796 Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Sun, 12 Feb 2017 14:45:33 +0800 Subject: [PATCH] =?UTF-8?q?generator=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/plugin/EncryptPropertyPlaceholderConfigurer.java | 2 +- .../main/java/com/zheng/common/util/MybatisGeneratorUtil.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 8b841171..69b2be83 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 fd50d556..d159843a 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); -- GitLab