Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

 pom.xml

@@ -43,6 +43,7 @@
        <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
        <spring.kafka.version>2.2.2</spring.kafka.version>
        <xxl-job.version>2.3.0</xxl-job.version>
        <aviator.version>5.2.5</aviator.version>
    </properties>


@@ -51,7 +52,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>

        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
@@ -126,6 +126,13 @@
            <artifactId>xxl-job-core</artifactId>
            <version>${xxl-job.version}</version>
        </dependency>
        <!-- https://mvnrepository.com/artifact/com.googlecode.aviator/aviator -->
        <dependency>
            <groupId>com.googlecode.aviator</groupId>
            <artifactId>aviator</artifactId>
            <version>${aviator.version}</version>
        </dependency>

    </dependencies>