Merge branch '1.x' into 1.x

2021-06-26 13:25:11 +08:00 · 2018-12-16 13:04:43 +08:00
parent 56c61c8a68 f022fa3c01
commit 6229b28f06
44 changed files with 1578 additions and 198 deletions
--- a/spring-cloud-alibaba-examples/pom.xml
+++ b/spring-cloud-alibaba-examples/pom.xml
@@ -29,6 +29,7 @@
        <module>acm-example/acm-local-example</module>
        <module>rocketmq-example</module>
        <module>spring-cloud-bus-rocketmq-example</module>
+        <module>schedulerx-example/schedulerx-simple-task-example</module>
    </modules>

    <build>