From 1beddbf8e8ef6ce4ebc35e7b184aa3fd6f072e32 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 21 Jun 2021 19:29:21 +0800
Subject: [PATCH] =?UTF-8?q?online=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=20#2672?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/config/init/CodeGenerateDbConfig.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java
index a2032932..99bd57e4 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java
@@ -1,5 +1,6 @@
 package org.jeecg.config.init;
 
+import com.alibaba.druid.filter.config.ConfigTools;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.codegenerate.database.CodegenDatasourceConfig;
@@ -25,11 +26,21 @@ public class CodeGenerateDbConfig {
     private String password;
     @Value("${spring.datasource.dynamic.datasource.master.driver-class-name:}")
     private String driverClassName;
+    @Value("${spring.datasource.dynamic.datasource.master.druid.public-key:}")
+    private String publicKey;
 
 
     @Bean
     public CodeGenerateDbConfig initCodeGenerateDbConfig() {
         if(StringUtils.isNotBlank(url)){
+            if(StringUtils.isNotBlank(publicKey)){
+                try {
+                    password = ConfigTools.decrypt(publicKey, password);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error(" 代码生成器数据库连接，数据库密码解密失败！");
+                }
+            }
             CodegenDatasourceConfig.initDbConfig(driverClassName,url, username, password);
             log.info(" 代码生成器数据库连接，使用application.yml的DB配置 ###################");
         }
-- 
GitLab