Merge remote-tracking branch 'origin/master'

zengh

2021-03-11 a67506723c8c8e6f0d223b864eaa69423a2710a8

 blade-auth/pom.xml

@@ -82,12 +82,12 @@
            <artifactId>easy-captcha</artifactId>
        </dependency>
        <!-- 链路追踪、服务监控 -->
        <!--<dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-trace</artifactId>
        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>org.springblade</groupId>-->
<!--            <artifactId>blade-starter-trace</artifactId>-->
<!--        </dependency>-->
        <!-- 解决Java11无法运行的问题 -->
        <!--<dependency>
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
            <version>2.2.11</version>
@@ -106,7 +106,7 @@
            <groupId>javax.activation</groupId>
            <artifactId>activation</artifactId>
            <version>1.1.1</version>
        </dependency>-->
        </dependency>
    </dependencies>

    <build>