diff --git a/pom.xml b/pom.xml index 1bff985fe..b2dd2bc05 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 5.4.1 - 2.8.8 + 3.0.0 2.3.0 3.2.0 diff --git a/wings/batrider/src/main/java/pro/fessional/wings/batrider/servcomb/handler/ProviderAuth9Handler.java b/wings/batrider/src/main/java/pro/fessional/wings/batrider/servcomb/handler/ProviderAuth9Handler.java index 3f918b8cd..fa90e610b 100644 --- a/wings/batrider/src/main/java/pro/fessional/wings/batrider/servcomb/handler/ProviderAuth9Handler.java +++ b/wings/batrider/src/main/java/pro/fessional/wings/batrider/servcomb/handler/ProviderAuth9Handler.java @@ -1,20 +1,22 @@ package pro.fessional.wings.batrider.servcomb.handler; -import org.apache.servicecomb.authentication.provider.ProviderAuthHanlder; +import org.apache.servicecomb.authentication.provider.ProviderAuthFilter; import org.apache.servicecomb.core.Invocation; -import org.apache.servicecomb.swagger.invocation.AsyncResponse; +import org.apache.servicecomb.core.filter.FilterNode; +import org.apache.servicecomb.swagger.invocation.Response; import pro.fessional.mirana.func.Dcl; import pro.fessional.wings.batrider.spring.prop.BatriderHandlerProp; import pro.fessional.wings.silencer.spring.help.ApplicationContextHelper; import java.util.HashSet; import java.util.Set; +import java.util.concurrent.CompletableFuture; /** * @author trydofor * @since 2022-08-07 */ -public class ProviderAuth9Handler extends ProviderAuthHanlder { +public class ProviderAuth9Handler extends ProviderAuthFilter { private final Dcl> skipSchemaId = Dcl.of(() -> { final BatriderHandlerProp prop = ApplicationContextHelper.getBean(BatriderHandlerProp.class); @@ -22,12 +24,12 @@ public class ProviderAuth9Handler extends ProviderAuthHanlder { }); @Override - public void handle(Invocation invocation, AsyncResponse asyncResp) throws Exception { + public CompletableFuture onFilter(Invocation invocation, FilterNode nextNode) { if (skipSchemaId.runIfDirty().contains(invocation.getSchemaId())) { - invocation.next(asyncResp); + return nextNode.onFilter(invocation); } else { - super.handle(invocation, asyncResp); + return super.onFilter(invocation, nextNode); } } } diff --git a/wings/batrider/src/main/java/pro/fessional/wings/batrider/spring/bean/BatriderServcombConfiguration.java b/wings/batrider/src/main/java/pro/fessional/wings/batrider/spring/bean/BatriderServcombConfiguration.java index 13031ed02..1e9fca1be 100644 --- a/wings/batrider/src/main/java/pro/fessional/wings/batrider/spring/bean/BatriderServcombConfiguration.java +++ b/wings/batrider/src/main/java/pro/fessional/wings/batrider/spring/bean/BatriderServcombConfiguration.java @@ -1,6 +1,6 @@ package pro.fessional.wings.batrider.spring.bean; -import org.apache.servicecomb.springboot2.starter.EnableServiceComb; + import org.springframework.context.annotation.Configuration; import pro.fessional.wings.silencer.spring.boot.ConditionalWingsEnabled; @@ -10,6 +10,5 @@ */ @Configuration(proxyBeanMethods = false) @ConditionalWingsEnabled -@EnableServiceComb public class BatriderServcombConfiguration { } 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 169e214e8..75bac59dd 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 @@ -11,7 +11,7 @@ dataSources: dataSourceClassName: com.zaxxer.hikari.HikariDataSource # driverClassName: org.h2.Driver # jdbcUrl: jdbc:h2:~/wings_shard_0;USER=trydofor;PASSWORD=moilioncircle;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;AUTO_RECONNECT=TRUE;AUTO_SERVER=TRUE - driverClassName: com.mysql.jdbc.Driver + driverClassName: com.mysql.cj.jdbc.Driver jdbcUrl: jdbc:mysql://localhost:3306/wings_shard_0 username: trydofor password: moilioncircle @@ -25,7 +25,7 @@ dataSources: dataSourceClassName: com.zaxxer.hikari.HikariDataSource # driverClassName: org.h2.Driver # jdbcUrl: jdbc:h2:~/wings_shard_1;USER=trydofor;PASSWORD=moilioncircle;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;AUTO_RECONNECT=TRUE;AUTO_SERVER=TRUE - driverClassName: com.mysql.jdbc.Driver + driverClassName: com.mysql.cj.jdbc.Driver jdbcUrl: jdbc:mysql://localhost:3306/wings_shard_1 username: trydofor password: moilioncircle diff --git a/wings/testing-database/pom.xml b/wings/testing-database/pom.xml index 8d3ccf0ad..6886c3249 100644 --- a/wings/testing-database/pom.xml +++ b/wings/testing-database/pom.xml @@ -33,6 +33,10 @@ com.h2database h2 + + com.mysql + mysql-connector-j + org.springframework.boot spring-boot-starter-test