Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev1

server/svr-discovery/pom.xml

@@ -30,10 +30,10 @@
            <artifactId>spring-boot-starter-logging</artifactId>
        </dependency>
        <!--给 eurika界面添加账号密码验证-->
        <!--<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</groupId>
            <artifactId>spring-webmvc</artifactId>

svr/svr-wlyy-health-bank/src/main/resources/bootstrap.yml

@@ -10,6 +10,15 @@ spring:
        enabled: true #使用发现服务
        service-id: svr-configurations #配置服务的名字
eureka:
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
    health-check-url-path: /health
---
spring: