Merge pull request #1538 from Zhuoyuan1/main

dbeaver的导入问题修复
This commit is contained in:
Chat2DB
2024-10-28 11:46:50 +08:00
committed by GitHub

View File

@ -231,6 +231,7 @@ public class ConverterServiceImpl implements ConverterService {
dataSourceDO.setSsh(JSON.toJSONString(sshInfo)); dataSourceDO.setSsh(JSON.toJSONString(sshInfo));
if (null != credentialsJson) { if (null != credentialsJson) {
JSONObject userInfo = credentialsJson.getJSONObject(key); JSONObject userInfo = credentialsJson.getJSONObject(key);
if (null != userInfo) {
JSONObject userPassword = userInfo.getJSONObject(connection); JSONObject userPassword = userInfo.getJSONObject(connection);
dataSourceDO.setUserName(userPassword.getString("user")); dataSourceDO.setUserName(userPassword.getString("user"));
DesUtil desUtil = new DesUtil(DesUtil.DES_KEY); DesUtil desUtil = new DesUtil(DesUtil.DES_KEY);
@ -238,6 +239,7 @@ public class ConverterServiceImpl implements ConverterService {
String encryptStr = desUtil.encrypt(Optional.ofNullable(password).orElse(""), "CBC"); String encryptStr = desUtil.encrypt(Optional.ofNullable(password).orElse(""), "CBC");
dataSourceDO.setPassword(encryptStr); dataSourceDO.setPassword(encryptStr);
} }
}
dataSourceDO.setType(dataBaseType.name()); dataSourceDO.setType(dataBaseType.name());
getDataSourceMapper().insert(dataSourceDO); getDataSourceMapper().insert(dataSourceDO);
} }