Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

 pom.xml

@@ -12,6 +12,7 @@
        <module>screen-api</module>
        <module>myBatisPlusGenerator</module>
        <module>screen-manage</module>
        <module>screen-job</module>

    </modules>
    <packaging>pom</packaging>
@@ -37,11 +38,14 @@
        <maven-shared-incremental.version>1.1</maven-shared-incremental.version>
        <spring-web.version>4.1.6.RELEASE</spring-web.version>
        <com.alibaba.druid.version>1.1.5</com.alibaba.druid.version>
        <org.mybatis-plus.spring.boot.version>3.3.2</org.mybatis-plus.spring.boot.version>
        <org.mybatis-plus.spring.boot.version>3.4.0</org.mybatis-plus.spring.boot.version>
        <org.projectlombok.version>1.16.18</org.projectlombok.version>
        <io.springfox.version>2.7.0</io.springfox.version>
        <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>
        <geodesy.version>1.1.3</geodesy.version>
    </properties>


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

        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
@@ -88,6 +91,10 @@
            <version>${spring.kafka.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-websocket</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.kafka</groupId>
            <artifactId>kafka-clients</artifactId>
            <version>${spring.kafka.version}</version>
@@ -107,6 +114,34 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.github.penggle</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3.2</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <dependency>
            <groupId>com.xuxueli</groupId>
            <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>

        <!-- https://mvnrepository.com/artifact/org.gavaghan/geodesy -->
        <dependency>
            <groupId>org.gavaghan</groupId>
            <artifactId>geodesy</artifactId>
            <version>${geodesy.version}</version>
        </dependency>

    </dependencies>