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

common/common-fegin/src/main/java/com/yihu/jw/fegin/DemoFeign.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
)
public interface DemoFeign {
    @RequestMapping(value = Contants.patient.findByCode, method = RequestMethod.GET)
    @RequestMapping(value = "/demo/findByCode", method = RequestMethod.GET)
    String findByCode(@RequestParam(value = "code", required = true) String code);
}

server/svr-configuration/pom.xml

@@ -29,10 +29,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-security</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -6,10 +6,10 @@ spring:
security:
  user:
    name: jw
    password:  jkzl
#security:
#  user:
#    name: jw
#    password:  jkzl
eureka:
  client:

server/svr-yihu-admin-server/pom.xml

@@ -3,27 +3,27 @@
         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">
    <parent>
        <groupId>com.yihu.jw</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <artifactId>jkzl-start</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>svr-yihu-admin-server</artifactId>
    <properties>
        <version.yihu.admin>1.2.0</version.yihu.admin>
    </properties>
    <dependencies>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>admin-server-starter</artifactId>
            <version>${version.yihu.admin}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>admin-server-ui-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <version>${version.yihu.admin}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -35,8 +35,9 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-autoconfigure</artifactId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>
    <build>

server/svr-yihu-admin-server/src/main/java/com.yihu.admin/YihuAdminServer.java

@@ -1,12 +1,30 @@
package com.yihu.admin;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.context.annotation.Configuration;
/**
 * Created by chenweida on 2017/8/15.
 */
@SpringBootApplication
@EnableAutoConfiguration(exclude = {
        DataSourceAutoConfiguration.class,
        HibernateJpaAutoConfiguration.class,
        ElasticsearchAutoConfiguration.class,
        ElasticsearchRepositoriesAutoConfiguration.class,
        ElasticsearchDataAutoConfiguration.class,
        RedisRepositoriesAutoConfiguration.class,
        JestAutoConfiguration.class
})
public class YihuAdminServer {
    public static void main(String[] args) {

server/svr-yihu-admin-server/src/main/resources/application.yml

@@ -1,22 +1,12 @@
server:
  port: 8999  ##端口修改 前端工程也需要改造
spring:
  application:
    name: svr-yihu-admin-server
  data:
    elasticsearch:
      cluster-name: jkzl #es集群的名字
      cluster-nodes: 172.19.103.68:9300  #多个逗号分割
      cluster-nodes-jest: http://172.19.103.68:9200  #多个逗号分割
      repositories:
        enabled: true
      properties:
        client:
          transport:
            sniff: true  #开启嗅探集群  用nginx代理一层过后会出现ip解析失败问题
      jest:
        discovery-enabled: true #开启嗅探
        discovery-enabled: false #开启嗅探
        conn-timeout: 60 # 连接时间单位是秒
        read-timeout: 60 # 读取时间单位是秒
        multith-readed: true #开启多线程
@@ -24,17 +14,16 @@ spring:
        max-connection-idle-time: 50 #最大等待时间
#logging:
#  file: ${logging.path}demo-eureka.log
#  path: G:\idea_workspace\jkzl_git\jkzl-start\logs\
#  level:
#    root: INFO
logging:
  file: ${logging.path}svr-yihu-admin-server.log
  path: G:\idea_workspace\jkzl_git\jkzl-start\logs\
  level:
    root: INFO
---
spring:
  profiles: jwdev

server/svr-yihu-admin-server/src/main/resources/bootstrap.yml

@@ -1,17 +1,3 @@
##优先读取 boostarap配置 然后在读取application。yml的配置
#spring:
#  #从发现服务里面取配置服务的信息
#  cloud:
#    config:
#      username: jw
#      password: jkzl
#      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
#      discovery:
#        enabled: true ##使用发现服务
#        service-id: svr-configurations ##配置服务的名字
#
##发现服务的地址
eureka:
  client:

svr-lib-parent-pom/pom.xml

@@ -143,8 +143,8 @@
                <version>1.0.0</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.base</groupId>
                <artifactId>common-security</artifactId>
                <groupId>com.yihu.jw</groupId>
                <artifactId>common-fegin</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>

svr/svr-base/src/main/java/com/yihu/jw/business/demo/DemoController.java

@@ -26,78 +26,13 @@ import javax.servlet.http.HttpServletRequest;
@Api(description = "demo例子")
@RefreshScope
public class DemoController {
    private Logger logger = LoggerFactory.getLogger(DemoController.class);
    @Autowired
    private DemoFeign patientFegin;
    @Autowired
    private Tracer tracer;
//    @Value("${test.aaa}")
    private String aaaa;
    @GetMapping("/hello")
    @ResponseBody
    public Envelop hello1(@RequestParam(name = "id") Integer id,
                          @RequestParam(name = "name") String name,
                          HttpServletRequest request
    ) throws Exception {
        tracer.getCurrentSpan().logEvent("logEvent");
        tracer.getCurrentSpan().tag("test","tag");
        tracer.getCurrentSpan().setBaggageItem("test","BaggageItem");
        switch (id) {
            case 1: {
                throw new ManageException("后台管理系统异常");
            }
            case 2: {
                throw new SecurityException("权限异常");
            }
            case 3: {
                throw new SystemException("后台系统异常");
            }
        }
        return Envelop.getSuccess("请求成功");
    }
    @GetMapping("/hello2")
    @ResponseBody
    public String hello2(String id) throws Exception {
        System.out.println("haha2.........");
        return "hello2";
    }
    @GetMapping("/refresh")
    @ResponseBody
    public String refresh(HttpServletRequest request) throws Exception {
        return aaaa;
    }
    @ApiOperation(value = "根据code查找患者")
    @GetMapping(value = "findByCode")
    //配置HystrixProperty 则调用的方法和fallback是同一个线程 否则就不是
    //@HystrixCommand(fallbackMethod = "findByCodeFallback",commandProperties = @HystrixProperty(name = "execution.isolation.strategy",value = "SEMAPHORE"))
//   @HystrixCommand(fallbackMethod = "findByCodeFallback" )
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false")})
    public String findByCode(
    public Envelop findByCode(
            @ApiParam(name = "code", value = "患者code", required = true) @RequestParam(value = "code", required = true) String code) {
        tracer.getCurrentSpan().logEvent("开始调用微服务查询患者");
        String text1 = patientFegin.findByCode(code);
        tracer.getCurrentSpan().logEvent("查询调用微服务找患者结束");
        return text1;
    }
//    /**
//     * 参数要一致 返回值类型也要一致
//     *
//     * @param code
//     * @return
//     */
//    public String findByCodeFallback(String code) {
//        return "启动断路器";
//    }
        return  Envelop.getSuccess(code);
    }
}

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

@@ -33,7 +33,11 @@ endpoints:
  info:
    enabled: true
yihu:
  admin:
    client:
      advice:
        sql: true
---
spring:

web-gateway/pom.xml

@@ -24,28 +24,43 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-fegin</artifactId>
            <version>1.0.2</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-exception</artifactId>
            <version>1.0.2</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>
            <version>1.0.2</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.data</groupId>
                    <artifactId>spring-data-elasticsearch</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.yihu.base</groupId>
                    <artifactId>common-data-es</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
            <version>1.0.2</version>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.data</groupId>
                    <artifactId>spring-data-elasticsearch</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-swagger</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>common-security-starter</artifactId>
@@ -89,24 +104,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <!--  <dependency>
              <groupId>org.springframework.boot</groupId>
              <artifactId>spring-boot-starter-actuator</artifactId>
          </dependency>-->
        <!--<dependency>-->
        <!--<groupId>org.springframework.boot</groupId>-->
        <!--<artifactId>spring-boot-starter-security</artifactId>-->
        <!--</dependency>-->
        <!--   <dependency>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-starter-data-redis</artifactId>
           </dependency>-->
        <!--  <dependency>
              <groupId>org.springframework.cloud</groupId>
              <artifactId>spring-cloud-starter-oauth2</artifactId>
          </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
@@ -154,11 +155,6 @@
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
        </dependency>
        <!--    <dependency>
                <groupId>org.springframework.security</groupId>
                <artifactId>spring-security-core</artifactId>
                <version>RELEASE</version>
            </dependency>-->
        <dependency>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
@@ -173,18 +169,8 @@
            <version>3.0.9</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.data</groupId>
                    <artifactId>spring-data-elasticsearch</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.yihu.base</groupId>
                    <artifactId>common-data-es</artifactId>
                </exclusion>
            </exclusions>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-elasticsearch</artifactId>
        </dependency>
    </dependencies>
    <build>

web-gateway/src/main/java/com/yihu/jw/WebGateWayAppliaction.java

@@ -1,7 +1,13 @@
package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
@@ -13,9 +19,7 @@ import org.springframework.context.annotation.ComponentScan;
/**
 * Created by chenweida on 2017/5/10.
 */
@SpringBootApplication(
        exclude = {DataSourceAutoConfiguration.class,
                HibernateJpaAutoConfiguration.class})
@SpringBootApplication
//@SpringBootApplication
@EnableDiscoveryClient//服务注册到发现服务
@EnableHystrix //启动断路器
@@ -25,6 +29,15 @@ import org.springframework.context.annotation.ComponentScan;
) //声名式的客户端
@EnableCircuitBreaker
@ComponentScan(basePackages = {"com"})
@EnableAutoConfiguration(exclude = {
        DataSourceAutoConfiguration.class,
        HibernateJpaAutoConfiguration.class,
        ElasticsearchAutoConfiguration.class,
        ElasticsearchRepositoriesAutoConfiguration.class,
        ElasticsearchDataAutoConfiguration.class,
        RedisRepositoriesAutoConfiguration.class,
        JestAutoConfiguration.class
})
public class WebGateWayAppliaction {
    public static void main(String[] args) {