From a72fe4c95f799eceded72fd4296108bbe9277d51 Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 22 Sep 2023 13:46:40 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20GenKit=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEjdbc-url=E6=8E=A8=E6=96=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pig4cloud/pigx/codegen/util/GenKit.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenKit.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenKit.java index a9605ebf4..21cfc7596 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenKit.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenKit.java @@ -1,12 +1,14 @@ package com.pig4cloud.pigx.codegen.util; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils; import com.pig4cloud.pigx.codegen.entity.GenDatasourceConf; import com.pig4cloud.pigx.codegen.mapper.GenDatasourceConfMapper; import com.pig4cloud.pigx.codegen.mapper.GeneratorMapper; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; -import com.pig4cloud.pigx.common.datasource.util.DsJdbcUrlEnum; +import com.pig4cloud.pigx.common.datasource.config.DruidDataSourceProperties; import lombok.experimental.UtilityClass; import org.springframework.context.ApplicationContext; @@ -51,9 +53,12 @@ public class GenKit { .selectOne(Wrappers.lambdaQuery().eq(GenDatasourceConf::getName, dsName)); String dbConfType; - // 默认MYSQL 数据源 + // 为空 根据jdbc-url推断数据库类型 if (datasourceConf == null) { - dbConfType = DsJdbcUrlEnum.MYSQL.getDbName(); + DruidDataSourceProperties dataSourceProperties = SpringContextHolder + .getBean(DruidDataSourceProperties.class); + DbType dbType = JdbcUtils.getDbType(dataSourceProperties.getUrl()); + dbConfType = dbType.getDb(); } else { dbConfType = datasourceConf.getDsType();