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

common-lib-parent-pom/pom.xml

@@ -6,11 +6,31 @@
    <groupId>com.yihu</groupId>
    <artifactId>common-lib-parent-pom</artifactId>
    <version>1.0-SNAPSHOT</version>
    <version>1.0.0</version>
    <packaging>pom</packaging>
    <modules>
        <module>../common/common-log</module>
        <module>../common/common-swagger</module>
    </modules>
    <properties>
        <version.swagger>2.4.0</version.swagger>
        <version.swagger-ui>2.4.0</version.swagger-ui>
    </properties>
    <dependencyManagement>
        <dependencies>
            <!--swagger ui start-->
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-swagger2</artifactId>
                <version>${version.swagger}</version>
            </dependency>
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-swagger-ui</artifactId>
                <version>${version.swagger-ui}</version>
            </dependency>
            <!--swagger ui end-->
        </dependencies>
    </dependencyManagement>
</project>

common/common-swagger/pom.xml

@@ -3,10 +3,26 @@
         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>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu</groupId>
    <artifactId>common-swagger</artifactId>
    <version>1.0-SNAPSHOT</version>
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
        </dependency>
    </dependencies>
</project>

common/common-swagger/readme.MD

@@ -0,0 +1,4 @@
swagger工具工程
需要用的微服务需要2步奏
    1 引入此工程
    2 修改swaggerConfig 配置 然后添加扫描的路径

common/common-swagger/src/main/java/com/yihu/common/config/SwaggerConfig.java

@@ -0,0 +1,76 @@
package com.yihu.common.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.**.controller")
public class SwaggerConfig {
    public static final String LEGACY_API = "Legacy";
    public static final String PUBLIC_API = "Default";
    @Bean
    public Docket publicAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(PUBLIC_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(or(regex("/api.*")))
                .build()
                .apiInfo(publicApiInfo());
    }
    @Bean
    public Docket legacyAPI(){
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(LEGACY_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(regex("/rest/v.*")))
                .build()
                .apiInfo(legacyApiInfo());
    }
    private ApiInfo legacyApiInfo() {
        ApiInfo apiInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API(历史兼容接口)，此部分API因为设计不规范，但已经发布，所以继续提供兼容。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
    private ApiInfo publicApiInfo() {
        ApiInfo apiInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供健康档案服务。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
}

readme.MD

@@ -1,8 +1,8 @@
项目结构
     common    公共的一些配置
        common-log   日志工程
        common-swagger   swagger工程
     svr    业务微服务  
        svr-user 用户微服务
     svr-configuration    配置服务
     svr-discovery    发现服务
     common-lib-parent-pom    common公共工程的maven父pom

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>

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

svr-configuration/src/main/resources/banner.txt

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

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

svr-discovery/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
spring:
  cloud:
    config:
      enabled: false
      enabled: false    ##是否加入配置服务
eureka:
  client:
@@ -23,10 +23,6 @@ info:
spring:
  profiles: dev
---
spring:
  profiles: alpha
---
spring:
  profiles: test

svr-lib-parent-pom/pom.xml

@@ -24,10 +24,14 @@
        <module>../svr-configuration</module> <!--配置服务-->
        <module>../svr-discovery</module><!--发现服务-->
        <!--业务微服务-->
        <module>../svr/svr-user</module><!--用户微服务-->
    </modules>
    <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作用子配置不写版本默认继承父配置-->
@@ -39,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>
@@ -46,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>

common/common-log/pom.xml

@@ -3,15 +3,15 @@
         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>common-log</artifactId>
    <artifactId>svr-user</artifactId>
    <version>1.0-SNAPSHOT</version>
    <properties>
    </properties>
    <dependencies>
    </dependencies>
</project>