center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 修复系统变量显示问题

Browse Source
This commit is contained in:
taojinlong 2024-06-05 15:06:00 +08:00
parent 049c661fd5
commit a6ca97f670
2 changed files with 79 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
View File

@ -341,6 +341,70 @@ public class CalciteProvider {
} }
} }
break; break;
case pg:
configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Pg.class);
if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
if (configuration.getJdbcUrl().contains("password=")) {
String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
String pd = "";
for (int i = 0; i < params.length; i++) {
if (params[i].contains("password=")) {
pd = params[i];
}
}
configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
}
}
break;
case redshift:
configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Redshift.class);
if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
if (configuration.getJdbcUrl().contains("password=")) {
String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
String pd = "";
for (int i = 0; i < params.length; i++) {
if (params[i].contains("password=")) {
pd = params[i];
}
}
configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
}
}
break;
case ck:
configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), CK.class);
if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
if (configuration.getJdbcUrl().contains("password=")) {
String[] params = configuration.getJdbcUrl().split("\\?")[1].split("&");
String pd = "";
for (int i = 0; i < params.length; i++) {
if (params[i].contains("password=")) {
pd = params[i];
}
}
configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
}
}
break;
case impala:
configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Impala.class);
if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
if (configuration.getJdbcUrl().contains("password=")) {
String[] params = configuration.getJdbcUrl().split(";")[1].split("&");
String pd = "";
for (int i = 0; i < params.length; i++) {
if (params[i].contains("password=")) {
pd = params[i];
}
}
configuration.setJdbcUrl(configuration.getJdbcUrl().replace(pd, "password=******"));
datasourceDTO.setConfiguration(JsonUtil.toJSONString(configuration).toString());
}
}
break;
default: default:
break; break;
} }

30
core/core-backend/src/main/resources/db/desktop/V2.7__ddl.sql
View File

@ -15,22 +15,22 @@ INSERT INTO `core_sys_startup_job` VALUES ('chartFilterMerge', 'chartFilterMerge
COMMIT; COMMIT;
DROP TABLE IF EXISTS "core_export_task"; DROP TABLE IF EXISTS `core_export_task`;
CREATE TABLE "core_export_task" CREATE TABLE `core_export_task`
( (
"id" VARCHAR(255) NOT NULL, `id` VARCHAR(255) NOT NULL,
"user_id" BIGINT(20) NOT NULL, `user_id` BIGINT(20) NOT NULL,
"file_name" VARCHAR(2048) DEFAULT NULL, `file_name` VARCHAR(2048) DEFAULT NULL,
"file_size" DOUBLE DEFAULT NULL, `file_size` DOUBLE DEFAULT NULL,
"file_size_unit" VARCHAR(255) DEFAULT NULL, `file_size_unit` VARCHAR(255) DEFAULT NULL,
"export_from" VARCHAR(255) DEFAULT NULL, `export_from` VARCHAR(255) DEFAULT NULL,
"export_status" VARCHAR(255) DEFAULT NULL, `export_status` VARCHAR(255) DEFAULT NULL,
"export_from_type" VARCHAR(255) DEFAULT NULL, `export_from_type` VARCHAR(255) DEFAULT NULL,
"export_time" BIGINT(20) DEFAULT NULL, `export_time` BIGINT(20) DEFAULT NULL,
"export_progress" VARCHAR(255) DEFAULT NULL, `export_progress` VARCHAR(255) DEFAULT NULL,
"export_machine_name" VARCHAR(512) DEFAULT NULL, `export_machine_name` VARCHAR(512) DEFAULT NULL,
"params" CLOB NOT NULL COMMENT '过滤参数', `params` longtext NOT NULL COMMENT '过滤参数',
PRIMARY KEY ("id") PRIMARY KEY (`id`)
) COMMENT='导出任务表'; ) COMMENT='导出任务表';
UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status'); UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status');