Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: hikari datasource auto proxy fail #5134

Merged
merged 12 commits into from
Dec 12, 2022
Merged

bugfix: hikari datasource auto proxy fail #5134

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e5457c7
bugfix: xa connect in the active,rollback fail
funky-eyes Dec 6, 2022
386eb01
update
funky-eyes Dec 6, 2022
813ce8e
update
funky-eyes Dec 6, 2022
9d1b97a
update
funky-eyes Dec 6, 2022
955700b
update
funky-eyes Dec 6, 2022
4ca1273
update
funky-eyes Dec 6, 2022
4c611a5
bugfix: hikari dataosurce auto proxy fail
funky-eyes Dec 7, 2022
77b0f41
Merge branch 'develop' into 1206
funky-eyes Dec 7, 2022
4621b18
update
funky-eyes Dec 8, 2022
b85bc4f
update
funky-eyes Dec 8, 2022
191707a
update
funky-eyes Dec 9, 2022
97e0115
update
funky-eyes Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...er/src/main/java/io/seata/spring/boot/autoconfigure/SeataDataSourceAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
package io.seata.spring.boot.autoconfigure;

import javax.sql.DataSource;

import io.seata.spring.annotation.datasource.SeataAutoDataSourceProxyCreator;
import io.seata.spring.boot.autoconfigure.properties.SeataProperties;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.core.Ordered;

import static io.seata.spring.annotation.datasource.AutoDataSourceProxyRegistrar.BEAN_NAME_SEATA_AUTO_DATA_SOURCE_PROXY_CREATOR;

Expand All @@ -34,7 +35,9 @@
*/
@ConditionalOnBean(DataSource.class)
@ConditionalOnExpression("${seata.enabled:true} && ${seata.enableAutoDataSourceProxy:true} && ${seata.enable-auto-data-source-proxy:true}")
@AutoConfigureAfter({SeataCoreAutoConfiguration.class})
@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
@AutoConfigureAfter(value = {SeataCoreAutoConfiguration.class},
name = "org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration")
public class SeataDataSourceAutoConfiguration {

/**
Expand All @@ -46,4 +49,5 @@ public SeataAutoDataSourceProxyCreator seataAutoDataSourceProxyCreator(SeataProp
return new SeataAutoDataSourceProxyCreator(seataProperties.isUseJdkProxy(),
seataProperties.getExcludesForAutoProxying(), seataProperties.getDataSourceProxyMode());
}

}