From 479f0c17f3db7df61be63b6fe735476af3cb5f4f Mon Sep 17 00:00:00 2001
From: twelvet <2471835953@qq.com>
Date: Sun, 5 Nov 2023 09:50:08 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=8F=91=E7=94=9F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: twelvet <2471835953@qq.com>
---
 .../service/impl/GenDatasourceConfServiceImpl.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
index 5b83efb2..56675fb5 100755
--- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
+++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java
@@ -83,6 +83,10 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
 	 */
 	@Override
 	public Boolean updateDsByEnc(GenDatasourceConf conf) {
+		GenDatasourceConf genDatasourceConf = baseMapper.selectById(conf.getId());
+		if (StrUtil.isBlank(conf.getPassword())) {
+			conf.setPassword(stringEncryptor.decrypt(genDatasourceConf.getPassword()));
+		}
 		if (!checkDataSource(conf)) {
 			return Boolean.FALSE;
 		}
@@ -94,9 +98,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;
 	}
-- 
Gitee