diff --git a/wings/faceless-shard/pom.xml b/wings/faceless-shard/pom.xml index 2a39c783d..d58778b26 100644 --- a/wings/faceless-shard/pom.xml +++ b/wings/faceless-shard/pom.xml @@ -21,6 +21,17 @@ pro.fessional.wings faceless-awesome + + + org.glassfish.jaxb + jaxb-runtime + 2.3.8 + + + org.yaml + snakeyaml + 1.33 + org.apache.shardingsphere diff --git a/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java b/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java index 651ff376e..79ba897ad 100644 --- a/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java +++ b/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java @@ -2,7 +2,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereDriverURLManager; +import org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLManager; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration; import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper; @@ -36,7 +36,8 @@ public DataSourceContext.Customizer shardingDataSourceContext(@Value("${spring.d return ignored -> false; } - final byte[] yamlBytes = ShardingSphereDriverURLManager.getContent(jdbcUrl); +// final byte[] yamlBytes = ShardingSphereDriverURLManager.getContent(jdbcUrl); + final byte[] yamlBytes = ShardingSphereURLManager.getContent(jdbcUrl, "jdbc:shardingsphere:"); YamlRootConfiguration rootConfig = YamlEngine.unmarshal(yamlBytes, YamlRootConfiguration.class); final YamlDataSourceConfigurationSwapper configurationSwapper = new YamlDataSourceConfigurationSwapper(); final Map dsMap = configurationSwapper.swapToDataSources(rootConfig.getDataSources()); diff --git a/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml b/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml index b4369e10a..169e214e8 100644 --- a/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml +++ b/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml @@ -66,3 +66,6 @@ rules: type: INLINE props: algorithm-expression: tst_sharding_$->{id % 5} + - !SINGLE + tables: + - "*.*" \ No newline at end of file