Merge branch 'master-jiayan' into master-jiayan-test

fwq

2024-09-24 03cc06f009f0645faea85297e8660afc1bf82846

 pom.xml

@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.hx.gitee</groupId>
        <artifactId>hx-parent</artifactId>
        <version>1.0-SNAPSHOT</version>
        <version>jiayan</version>
    </parent>

    <artifactId>hx-common</artifactId>
@@ -21,7 +21,7 @@
            <artifactId>jaxb-api</artifactId>
        </dependency>

        <dependency>
      <!--  <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>3.9</version>
@@ -31,12 +31,17 @@
                    <groupId>dom4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--腾讯云 cos-->
        <dependency>
            <groupId>com.qcloud</groupId>
            <artifactId>cos_api</artifactId>
        </dependency>

        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>
        </dependency>

        <!--发送邮件-->
@@ -113,11 +118,6 @@
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- excel2003使用的jar -->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
@@ -139,6 +139,12 @@
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>jstl</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
            <!--<scope>provided</scope>-->
        </dependency>

        <!-- mybatis自动生成 -->
@@ -284,10 +290,17 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>

        <!-- https://mvnrepository.com/artifact/com.monitorjbl/xlsx-streamer -->
        <dependency>
            <groupId>com.monitorjbl</groupId>
            <artifactId>xlsx-streamer</artifactId>
        </dependency>

    </dependencies>

    <build>
        <finalName>hx-demoboot</finalName>
        <finalName>hx-common</finalName>
        <resources>
            <resource>
                <directory>src/main/java</directory>