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配置 ###################");
         }