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

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

@@ -1,6 +1,11 @@
server:
  port: 1221
security:
  user:
    name: jw
    password:  jkzl
eureka:
  client:
@@ -11,7 +16,8 @@ eureka:
    prefer-ip-address: true
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
    instance-id: 172.19.103.33:${server.port}
    ip-address: 172.19.103.33
@@ -56,13 +62,3 @@ eureka:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
---
spring:
  profiles: jwdev
eureka:
  client:
    serviceUrl:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka

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

@@ -4,22 +4,6 @@ spring:
  jmx:
    default-domain: ${spring.application.name}
security:
  user:
    name: jw
    password:  jkzl
eureka:
  client:
    healthcheck:
      enabled: true #启动监控检查
  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}
---
spring:
@@ -33,7 +17,7 @@ spring:
#          uri: http://192.168.1.220:10080/chenweida/jw.config.git
#          uri: http://192.168.116.100:10080/chenweida/mini.jw.config.git
#         uri: http://192.168.1.220:10080/jiwei/jw.config.git
         uri: 172.19.103.33:1221/jiwei/jw.config.git
         uri: http://192.168.1.220:10080/jiwei/jw.config.git
        default-label: jwdev
@@ -66,14 +50,14 @@ spring:
---
##不想用远程的git 可以在环境变量配置native 开启本地配置
spring:
  profiles:
    active: native
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        native:
          search-locations: file:D:\Software\soft\IdeaWorkSpace\jw-project\jw.config  ##本地的got配置路径
#spring:
#  profiles:
#    active: native
#
###git配置
#  cloud:
#    config:
#      failFast: true #启动快速失败 即链接不到配置服务就启动失败
#      server:
#        native:
#          search-locations: file:D:\Software\soft\IdeaWorkSpace\jw-project\jw.config  ##本地的got配置路径

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

@@ -37,7 +37,7 @@ spring:
eureka:
  client:
    service-url:
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
---
spring: