chenweida 8 rokov pred
rodič
commit
2d6bec40ed

+ 20 - 0
svr-configuration/pom.xml

@ -32,6 +32,26 @@
            <groupId>org.springframework.boot</groupId>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-bus-kafka</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
    </dependencies>
    </dependencies>
</project>
</project>

+ 12 - 5
svr-configuration/src/main/resources/application.yml

@ -1,16 +1,23 @@
server:
server:
  port: 1221
  port: 1221
##配置服务的账号密码
security:
  user:
    name: jw
    password:  jkzl
---
---
spring:
spring:
  profiles: jwdev
  profiles: jwdev
#
#  cloud:
#    stream:
#      kafka:
#        binder:
#          brokers: 172.17.110.201
#          defaultBrokerPort: 9092
#          zkNodes: 172.17.110.201
#          defaultZkPort: 2181
#          replicationFactor: 1
eureka:
eureka:
  client:
  client:

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

@ -15,6 +15,8 @@ spring:
          #uri: http://192.168.116.100:10080/chenweida/mini.jw.config.git
          #uri: http://192.168.116.100:10080/chenweida/mini.jw.config.git
        default-label: master
        default-label: master
---
---
spring:
spring:
  profiles: jwtest
  profiles: jwtest

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

@ -9,7 +9,7 @@ eureka:
  client:
  client:
    register-with-eureka: false
    register-with-eureka: false
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    fetch-registry: false
    fetch-registry: false ##如果是做高可用的发现服务那就要改成true
    service-url:
    service-url:
      defaultZone: http://jw:jkzl@localhost:8761/eureka
      defaultZone: http://jw:jkzl@localhost:8761/eureka

+ 7 - 1
svr-lib-parent-pom/pom.xml

@ -39,7 +39,7 @@
        <version.springCloud.start>1.2.0.RELEASE</version.springCloud.start>
        <version.springCloud.start>1.2.0.RELEASE</version.springCloud.start>
        <version.springBoot>1.5.3.RELEASE</version.springBoot>
        <version.springBoot>1.5.3.RELEASE</version.springBoot>
        <version.mysql>5.1.38</version.mysql>
        <version.mysql>5.1.38</version.mysql>
        <version.jackson>2.6.6</version.jackson>
        <version.jackson>2.8.1</version.jackson>
        <version.myCommon>1.0.0</version.myCommon>
        <version.myCommon>1.0.0</version.myCommon>
        <version.spring>4.3.3.RELEASE</version.spring>
        <version.spring>4.3.3.RELEASE</version.spring>
    </properties>
    </properties>
@ -116,6 +116,12 @@
                <artifactId>spring-cloud-starter-turbine</artifactId>
                <artifactId>spring-cloud-starter-turbine</artifactId>
                <version>${version.springCloud}</version>
                <version>${version.springCloud}</version>
            </dependency>
            </dependency>
            <!--配置服务消息总线-->
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-bus-kafka</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-feign</artifactId>
                <artifactId>spring-cloud-starter-feign</artifactId>

+ 16 - 0
web-gateway/pom.xml

@ -67,5 +67,21 @@
            <groupId>org.springframework.cloud</groupId>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zuul</artifactId>
            <artifactId>spring-cloud-starter-zuul</artifactId>
        </dependency>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-bus-kafka</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
    </dependencies>
    </dependencies>
</project>
</project>

+ 10 - 1
web-gateway/src/main/java/com/yihu/jw/controller/PatientController.java

@ -9,6 +9,8 @@ import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.http.ResponseEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.client.RestTemplate;
@ -20,10 +22,13 @@ import org.springframework.web.context.annotation.SessionScope;
@RestController
@RestController
@RequestMapping("/rest/patient")
@RequestMapping("/rest/patient")
@Api(description = "患者")
@Api(description = "患者")
@RefreshScope
public class PatientController {
public class PatientController {
    private Logger logger= LoggerFactory.getLogger(PatientController.class);
    private Logger logger= LoggerFactory.getLogger(PatientController.class);
    @Autowired
    @Autowired
    private PatientFegin patientFegin;
    private PatientFegin patientFegin;
    @Value("${test}")
    private  String test;
    @ApiOperation(value = "根据code查找患者")
    @ApiOperation(value = "根据code查找患者")
    @GetMapping(value = "findByCode")
    @GetMapping(value = "findByCode")
@ -41,7 +46,11 @@ public class PatientController {
        String text2 =patientFegin.findByCode(code);
        String text2 =patientFegin.findByCode(code);
        return text1+text2;
        return text1+text2;
    }
    }
    @ApiOperation(value = "测试配置刷新")
    @GetMapping(value = "test")
    public String test() {
        return test;
    }
//    /**
//    /**
//     * 参数要一致 返回值类型也要一致
//     * 参数要一致 返回值类型也要一致
//     *
//     *

+ 10 - 2
web-gateway/src/main/resources/application.yml

@ -12,7 +12,7 @@ feign:
#zuul 默认会代理所有的微服务  路径 /{appliction.name}/**
#zuul 默认会代理所有的微服务  路径 /{appliction.name}/**
zuul:
zuul:
  ignored-services: '*'  ##忽略全部的代理  忽略单个微服务   ignored-services: svr-base 多个逗号分割
#  ignored-services: '*'  ##忽略全部的代理  忽略单个微服务   ignored-services: svr-base 多个逗号分割
  routes:
  routes:
    svr-base: /base/**  ##svr-base方向代理到/base下多层级的路径
    svr-base: /base/**  ##svr-base方向代理到/base下多层级的路径
#    svr-base:    这种方式和  svr-base: /base/**  一样  svr-base可以随便写 唯一即可
#    svr-base:    这种方式和  svr-base: /base/**  一样  svr-base可以随便写 唯一即可
@ -34,7 +34,15 @@ zuul:
---
---
spring:
spring:
  profiles: jwdev
  profiles: jwdev
#  cloud:
#    stream:
#      kafka:
#        binder:
#          brokers: 172.17.110.201
#          defaultBrokerPort: 9092
#          zkNodes: 172.17.110.201
#          defaultZkPort: 2181
#          replicationFactor: 1
---
---
spring:
spring:
  profiles: jwtest
  profiles: jwtest