From 81351aeb7ae9500544175ad4f4f30366b9e8b4b3 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 20 Sep 2023 11:53:25 +0800 Subject: [PATCH] =?UTF-8?q?dynamic-datasource-spring-boot-starter=E6=94=B9?= =?UTF-8?q?=E4=B8=BA3.5.2=E7=A8=B3=E5=AE=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/common/util/CommonUtils.java | 2 +- .../modules/system/service/impl/SysDataSourceServiceImpl.java | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index 3d370ec0..c4940dcf 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -1,7 +1,7 @@ package org.jeecg.common.util; import com.alibaba.fastjson.JSONObject; -import com.baomidou.dynamic.datasource.creator.DataSourceProperty; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java index d0853c5b..f3052ec2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java @@ -1,8 +1,8 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.baomidou.dynamic.datasource.creator.DataSourceProperty; -import com.baomidou.dynamic.datasource.creator.druid.DruidDataSourceCreator; +import com.baomidou.dynamic.datasource.creator.DruidDataSourceCreator; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; diff --git a/pom.xml b/pom.xml index f8d801c2..40242f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 3.5.3.2 - 4.1.3 + 3.5.2 1.2.15 1.9.3