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

server/svr-configuration/pom.xml

@@ -7,7 +7,7 @@
        <groupId>com.yihu.jw</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../svr-lib-parent-pom/pom.xml</relativePath>
        <relativePath>../../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>

server/svr-dashboard/pom.xml

@@ -7,7 +7,7 @@
        <groupId>com.yihu.jw</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../svr-lib-parent-pom/pom.xml</relativePath>
        <relativePath>../../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-dashboard</artifactId>

server/svr-discovery/pom.xml

@@ -7,7 +7,7 @@
        <groupId>com.yihu.jw</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../svr-lib-parent-pom/pom.xml</relativePath>
        <relativePath>../../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>

server/svr-logServer/pom.xml

@@ -7,7 +7,7 @@
        <groupId>com.yihu.jw</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../svr-lib-parent-pom/pom.xml</relativePath>
        <relativePath>../../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yih.jw</groupId>
    <artifactId>svr-logServer</artifactId>

svr-lib-parent-pom/pom.xml

@@ -33,10 +33,10 @@
    </distributionManagement>
    <modules>
        <module>../svr-configuration</module> <!--配置服务-->
        <module>../svr-discovery</module><!--发现服务-->
        <module>../svr-dashboard</module><!--监控服务-->
        <module>../svr-logServer</module><!--分布式追踪服务-->
        <module>../server/svr-configuration</module> <!--配置服务-->
        <module>../server/svr-discovery</module><!--发现服务-->
        <module>../server/svr-dashboard</module><!--监控服务-->
        <module>../server/svr-logServer</module><!--分布式追踪服务-->
        <!--业务微服务-->
        <module>../svr/svr-base</module><!--基础微服务-->