新增i健康分支

server/svr-admin-server/pom.xml

@@ -51,10 +51,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-config</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zuul</artifactId>

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

@@ -1,5 +1,5 @@
server:
  port: 8082
  port: 8084
spring:
  application:

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

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

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

@@ -20,7 +20,6 @@ spring:
#            sniff: false #开启嗅探集群  用nginx代理一层过后会出现ip解析失败问题
management:
  security:
    enabled: false #关闭 refresh的权限认证

web-gateway/src/main/java/com/yihu/jw/controller/base/login/LoginContorller.java

@@ -84,6 +84,10 @@ public class LoginContorller {
                       @ApiParam(name = "password", value = "password", required = false) @RequestParam(value = "password", required = false) String password,
                       @ApiParam(name = "saasId", value = "saasID", required = true) @RequestParam(value = "saasId", required = true) String saasId,
                       @ApiParam(name = "captcha", value = "短信验证码", required = false) @RequestParam(value = "captcha", required = false) String captcha){
        //1 框架登录
        //2 base取用户信息
        return loginFeign.login(mobilePhone,password,saasId,captcha);
    }
//    @PostMapping("/logout")

web-gateway/src/main/resources/application.yml

@@ -62,6 +62,7 @@ ribbon:
  ConnectTimeout: 5000
#zuul 默认会代理所有的微服务  路径 /{appliction.name}/**
#zuul:
#  ignored-services: '*'  ##忽略全部的代理  忽略单个微服务   ignored-services: svr-base 多个逗号分割