Merge branch 'master' of http://192.168.1.220:10080/EHR/svr-pack-analyzer

# Conflicts:
#	pom.xml

pom.xml

@@ -28,7 +28,6 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
            
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
@@ -59,17 +58,6 @@
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-data-elasticsearch</artifactId>
            <exclusions>
                <exclusion>
                        <groupId>org.elasticsearch</groupId>
                        <artifactId>elasticsearch</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.elasticsearch</groupId>
            <artifactId>elasticsearch</artifactId>
            <version>2.4.6</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
@@ -106,17 +94,14 @@
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-web</artifactId>
           
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-profile-core</artifactId>
           
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-redis-mq</artifactId>
           
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
@@ -145,6 +130,19 @@
        <dependency>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
        </dependency>
		<dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-cat</artifactId>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
</project>

src/main/resources/META-INF/app.properties

@@ -0,0 +1 @@
app.name=svr-pack-analyzer