Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-06-07 675ccd51874f9c005285eab3e4829e451848b4b6

 pom.xml

@@ -28,6 +28,11 @@
        <module>service-acct</module>
        <module>service-oa</module>
        <module>service-dev</module>
        <module>service-scm</module>
        <module>springboot</module>
        <module>java110-boot</module>
        <module>java110-doc</module>


    </modules>

@@ -53,7 +58,7 @@
        <tomcat.servlet.version>6.0.37</tomcat.servlet.version>
        <druid.version>1.1.10</druid.version>
        <mybatis-spring.version>1.3.1</mybatis-spring.version>
        <mysql.version>8.0.28</mysql.version>
        <mysql.version>8.0.16</mysql.version>
        <commons-pool2.version>2.2</commons-pool2.version>
        <commons-collections.version>3.2.1</commons-collections.version>
        <commons-fileupload.version>1.3.3</commons-fileupload.version>
@@ -159,6 +164,12 @@
            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-db</artifactId>
                <version>${microcommunity.version}</version>
            </dependency>

            <dependency>
                <groupId>com.java110</groupId>
                <artifactId>java110-doc</artifactId>
                <version>${microcommunity.version}</version>
            </dependency>
            <!-- logback 日志组件支持  -->
@@ -436,7 +447,7 @@
            <dependency>
                <groupId>org.jsoup</groupId>
                <artifactId>jsoup</artifactId>
                <version>1.14.2</version>
                <version>1.15.3</version>
            </dependency>

            <!-- 引入poi，解析workbook视图 -->
@@ -514,11 +525,7 @@
                <version>5.6.69</version>
            </dependency>

            <dependency>
                <groupId>org.mybatis</groupId>
                <artifactId>mybatis-typehandlers-jsr310</artifactId>
                <version>1.0.2</version>
            </dependency>


        </dependencies>