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

java110

2023-06-07 675ccd51874f9c005285eab3e4829e451848b4b6

 pom.xml

@@ -25,10 +25,14 @@
        <module>service-job</module>
        <module>service-common</module>
        <module>service-report</module>
        <module>java110-generator</module>
        <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>

@@ -43,14 +47,14 @@
        <maven.compile.target>1.8</maven.compile.target>
        <sourceEncoding>UTF-8</sourceEncoding>
        <spring-boot>2.0.4.RELEASE</spring-boot>
        <mybatis.version>3.3.0</mybatis.version>
        <mybatis.version>3.5.6</mybatis.version>
        <microcommunity.version>1.0-SNAPSHOT</microcommunity.version>
        <dubbo.version>2.5.4-SNAPSHOT</dubbo.version>
        <logback.vaersion>1.2.3</logback.vaersion>
        <logback.vaersion>1.2.9</logback.vaersion>

        <apache.common.lang3.version>3.4</apache.common.lang3.version>
        <mybatis.version>3.4.1</mybatis.version>
        <log4j.version>2.17.0</log4j.version>
        <mybatis.version>3.5.6</mybatis.version>
        <log4j.version>2.17.1</log4j.version>
        <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>
@@ -63,7 +67,7 @@
        <commons-lang.version>2.5</commons-lang.version>
        <commons-beanutils.version>1.8.0</commons-beanutils.version>
        <slf4j.version>1.7.7</slf4j.version>
        <logback.version>1.1.2</logback.version>
        <logback.version>1.2.9</logback.version>
        <activemq.version>5.7.0</activemq.version>
        <xbean.version>3.18</xbean.version>
        <axis.version>1.4</axis.version>
@@ -100,7 +104,7 @@
            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>fastjson</artifactId>
                <version>1.2.79</version>
                <version>1.2.83</version>
            </dependency>
            <dependency>
                <groupId>org.mybatis.spring.boot</groupId>
@@ -160,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 日志组件支持  -->
@@ -437,7 +447,7 @@
            <dependency>
                <groupId>org.jsoup</groupId>
                <artifactId>jsoup</artifactId>
                <version>1.11.3</version>
                <version>1.15.3</version>
            </dependency>

            <!-- 引入poi，解析workbook视图 -->
@@ -502,6 +512,21 @@
                <artifactId>alipay-sdk-java</artifactId>
                <version>4.10.111.ALL</version>
            </dependency>

            <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
            <dependency>
                <groupId>commons-codec</groupId>
                <artifactId>commons-codec</artifactId>
                <version>1.15</version>
            </dependency>
            <dependency>
                <groupId>com.qcloud</groupId>
                <artifactId>cos_api</artifactId>
                <version>5.6.69</version>
            </dependency>



        </dependencies>

    </dependencyManagement>