Merge branch 'dev' of chenweida/jw2.0 into dev

base/common-cache/pom.xml

@@ -10,7 +10,6 @@
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>common-cache</groupId>
    <artifactId>common-cache</artifactId>
    <version>1.0.0</version>
@@ -27,7 +26,6 @@
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-async</artifactId>
            <version>1.0.0</version>
        </dependency>
    </dependencies>
    

common-lib-parent-pom/pom.xml

@@ -35,6 +35,8 @@
        <module>../base/common-data-redis</module>
        <module>../base/common-data-hbase</module>
        <module>../base/common-security</module>
        <module>../base/common-cache</module>
        <module>../base/common-async</module>
    </modules>
</project>

svr-lib-parent-pom/pom.xml

@@ -94,6 +94,11 @@
        <dependencies>
            <!--自己的封装 common -->
            <dependency>
                <groupId>com.yihu.base</groupId>
                <artifactId>common-async</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.base</groupId>
                <artifactId>common-security</artifactId>