From 1b27c695d8a85b29499c4f06ae367f7298107580 Mon Sep 17 00:00:00 2001
From: PIGCLOUD <wangiegie@gmail.com>
Date: Tue, 3 Mar 2026 09:07:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(pigx-codegen):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=AF=86=E7=A0=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 密码为空时自动从数据库查询并解密原始密码用于连接校验
- 简化密码加密逻辑，移除冗余的条件判断
---
 .../service/impl/GenDatasourceConfServiceImpl.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
index eca0a0d01..4f6784309 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
@@ -83,6 +83,12 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
 	 */
 	@Override
 	public Boolean updateDsByEnc(GenDatasourceConf conf) {
+        // 密码为空时，从数据库查询原始密码并解密，用于连接校验
+        if (StrUtil.isBlank(conf.getPassword())) {
+            GenDatasourceConf dbConf = this.baseMapper.selectById(conf.getId());
+            conf.setPassword(stringEncryptor.decrypt(dbConf.getPassword()));
+        }
+
 		if (!checkDataSource(conf)) {
 			return Boolean.FALSE;
 		}
@@ -94,9 +100,7 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
 		addDynamicDataSource(conf);
 
 		// 更新数据库配置
-		if (StrUtil.isNotBlank(conf.getPassword())) {
-			conf.setPassword(stringEncryptor.encrypt(conf.getPassword()));
-		}
+        conf.setPassword(stringEncryptor.encrypt(conf.getPassword()));
 		this.baseMapper.updateById(conf);
 		return Boolean.TRUE;
 	}