Browse Source

提交到Dev分支

chenweida 8 years ago
parent
commit
68255c2af3

+ 0 - 1
common-lib-parent-pom/pom.xml

@ -9,7 +9,6 @@
    <version>1.0.0</version>
    <packaging>pom</packaging>
    <modules>
        <module>../common/common-log</module>
        <module>../common/common-swagger</module>
    </modules>

+ 27 - 0
svr-configuration/pom.xml

@ -3,10 +3,37 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu</groupId>
    <artifactId>svr-configuration</artifactId>
    <version>1.0-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-config-server</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>ch.qos.logback</groupId>
                    <artifactId>logback-classic</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
    </dependencies>
</project>

+ 43 - 0
svr-configuration/src/main/resources/application.yml

@ -0,0 +1,43 @@
server:
  port: 1221
management:
  port: ${server.port}
security:
  user:
    password: configuration
info:
  app:
    name: ConfigurationService
    description: EHR平台全局配置服务
    version: 1.0.0
---
spring:
  profiles: dev
eureka:
  instance:
    ip-address: 127.0.0.1:8761
    #ip-address: 192.168.1.221:8761
    prefer-ip-address: false
---
spring:
  profiles: test
eureka:
  instance:
    ip-address: 172.19.103.73:8761
    prefer-ip-address: true
---
spring:
  profiles: prod
eureka:
  instance:
    ip-address: 11.1.2.21:8761
    prefer-ip-address: true

+ 9 - 0
svr-configuration/src/main/resources/banner.txt

@ -0,0 +1,9 @@
   _____              _____             __ _                       _   _
  / ____|            / ____|           / _(_)                     | | (_)
 | (_____   ___ __  | |     ___  _ __ | |_ _  __ _ _   _ _ __ __ _| |_ _  ___  _ __
  \___ \ \ / / '__| | |    / _ \| '_ \|  _| |/ _` | | | | '__/ _` | __| |/ _ \| '_ \
  ____) \ V /| |    | |___| (_) | | | | | | | (_| | |_| | | | (_| | |_| | (_) | | | |
 |_____/ \_/ |_|     \_____\___/|_| |_|_| |_|\__, |\__,_|_|  \__,_|\__|_|\___/|_| |_|
                                              __/ |
                                             |___/

+ 47 - 0
svr-configuration/src/main/resources/bootstrap.yml

@ -0,0 +1,47 @@
spring:
  application:
    name: svr-configurations
---
spring:
  profiles: dev
  cloud:
    config:
      server:
        git:
          #uri: http://192.168.1.220:10080/hill9868/ehr.config.git
          uri: http://192.168.1.220:10080/EHR/ehr.config.git
        default-label: dev
---
spring:
  profiles: alpha
  cloud:
    config:
      server:
        git:
          uri: http://192.168.1.220:10080/EHR/ehr.config.git
        default-label: dev
---
spring:
  profiles: test
  cloud:
    config:
      server:
        git:
          uri: http://192.168.1.220:10080/EHR/ehr.config.git
        default-label: dev
---
spring:
  profiles: prod
  cloud:
    config:
      server:
        git:
          uri: http://11.1.2.8:3000/ehr_admin/ehr.config.git
        default-label: master

+ 60 - 0
svr-lib-parent-pom/pom.xml

@ -31,6 +31,7 @@
    <properties>
        <version.springCloud>1.3.0.RELEASE</version.springCloud>
        <version.springCloud.start>1.2.0.RELEASE</version.springCloud.start>
        <version.springBoot>1.5.3.RELEASE</version.springBoot>
    </properties>
    <!--dependencyManagement作用子配置不写版本默认继承父配置-->
@ -42,6 +43,53 @@
                <artifactId>spring-cloud-starter-eureka-server</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-config-server</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-ribbon</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-zuul</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-bus-amqp</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-feign</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <!--断路由-->
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-hystrix</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter</artifactId>
                <version>${version.springCloud.start}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
                <version>${version.springCloud.start}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-zipkin</artifactId>
                <version>${version.springCloud.start}</version>
            </dependency>
            <!--springCloud end-->
            <!--springBoot start-->
            <dependency>
@ -49,6 +97,18 @@
                <artifactId>spring-boot</artifactId>
                <version>${version.springBoot}</version>
            </dependency>
            <!--web模块-->
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-web</artifactId>
                <version>${version.springBoot}</version>
            </dependency>
            <!--自动注入模块-->
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-autoconfigure</artifactId>
                <version>${version.springBoot}</version>
            </dependency>
            <!--springBoot end-->
        </dependencies>
    </dependencyManagement>