From a86cfaa5e43f2c36afd8bfef457ddd375a8e7580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=85=B4=E5=8D=8E?= Date: Tue, 19 Mar 2019 14:34:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?spring-cloud=20=E5=8D=87=E7=BA=A7=E5=88=B0G?= =?UTF-8?q?reenwich.RELEASE=20spring-boot-starter-parent=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B0=202.1.3.RELEASE=20spring.boot.admin=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=202.1.3=20kernel.version=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=201.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c1fa578..45362b0 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.3.RELEASE @@ -27,8 +27,9 @@ 1.8 UTF-8 UTF-8 - Finchley.SR2 - 2.0.1 + Greenwich.RELEASE + 2.1.3 + 1.2.0 @@ -36,22 +37,22 @@ cn.stylefeng.roses kernel-model - ${project.version} + ${kernel.version} cn.stylefeng.roses kernel-core - ${project.version} + ${kernel.version} cn.stylefeng.roses kernel-sign - ${project.version} + ${kernel.version} cn.stylefeng.roses kernel-actuator - ${project.version} + ${kernel.version} -- Gitee From 2174618e04a6e5f380936fd4f420b2bb77a526eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=85=B4=E5=8D=8E?= Date: Thu, 21 Mar 2019 10:05:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9git=20repo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roses-config-server/src/main/resources/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roses-config-server/src/main/resources/bootstrap.yml b/roses-config-server/src/main/resources/bootstrap.yml index cd5d8f1..d266a07 100644 --- a/roses-config-server/src/main/resources/bootstrap.yml +++ b/roses-config-server/src/main/resources/bootstrap.yml @@ -25,7 +25,7 @@ spring: server: bootstrap: true git: - uri: https://gitee.com/stylefeng-Roses/roses-config-repo.git + uri: https://gitee.com/kangxinghua/roses-config-repo.git username: xxxx password: xxxx search-paths: /** @@ -45,7 +45,7 @@ spring: server: bootstrap: true git: - uri: https://gitee.com/stylefeng-Roses/roses-config-repo.git + uri: https://gitee.com/kangxinghua/roses-config-repo.git username: xxxx password: xxxx search-paths: /** @@ -65,7 +65,7 @@ spring: server: bootstrap: true git: - uri: https://gitee.com/stylefeng-Roses/roses-config-repo.git + uri: https://gitee.com/kangxinghua/roses-config-repo.git username: xxxx password: xxxx search-paths: /** -- Gitee From f86bb8a40ddcef087332a699bd030cbeeba380b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=85=B4=E5=8D=8E?= Date: Mon, 15 Apr 2019 10:52:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=EF=BC=88=E6=9C=8D=E5=8A=A1=E5=8C=96=E4=B8=8E=E9=AB=98=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- roses-config-server/pom.xml | 4 ++ .../src/main/resources/bootstrap.yml | 24 +++++-- .../src/main/resources/bootstrap.yml | 69 ++++++++++--------- 4 files changed, 58 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index 45362b0..7cf460e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ UTF-8 Greenwich.RELEASE 2.1.3 - 1.2.0 + 1.2.3.1 diff --git a/roses-config-server/pom.xml b/roses-config-server/pom.xml index 38ff07f..31f4093 100644 --- a/roses-config-server/pom.xml +++ b/roses-config-server/pom.xml @@ -35,6 +35,10 @@ org.springframework.boot spring-boot-starter-security + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + diff --git a/roses-config-server/src/main/resources/bootstrap.yml b/roses-config-server/src/main/resources/bootstrap.yml index d266a07..f4cbbd2 100644 --- a/roses-config-server/src/main/resources/bootstrap.yml +++ b/roses-config-server/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: spring: application: - name: ROSES-CONFIG-SERVER + name: roses-config-server profiles: active: @spring.active@ @@ -29,12 +29,22 @@ spring: username: xxxx password: xxxx search-paths: /** - boot: - admin: - client: - url: http://127.0.0.1:9000 - instance: - service-base-url: http://127.0.0.1:8002 +# boot: +# admin: +# client: +# url: http://127.0.0.1:9000 +# instance: +# service-base-url: http://127.0.0.1:8002 + +eureka: + instance: + prefer-ip-address: true + lease-expiration-duration-in-seconds: 20 #服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除(默认90秒) + lease-renewal-interval-in-seconds: 5 #服务刷新时间配置，每隔这个时间会主动心跳一次(默认30秒) + client: + service-url: + defaultZone: http://127.0.0.1:8761/eureka + registry-fetch-interval-seconds: 10 #重新刷新服务地址的时间 --- diff --git a/roses-spring-boot-admin/src/main/resources/bootstrap.yml b/roses-spring-boot-admin/src/main/resources/bootstrap.yml index d069f1a..1fc1ed9 100644 --- a/roses-spring-boot-admin/src/main/resources/bootstrap.yml +++ b/roses-spring-boot-admin/src/main/resources/bootstrap.yml @@ -7,36 +7,39 @@ spring: config: profile: @spring.active@ label: master - ---- - -spring: - profiles: local - cloud: - config: - enabled: true - uri: http://127.0.0.1:8002 - ---- - -spring: - profiles: dev - cloud: - config: - uri: http://127.0.0.1:8002 - ---- - -spring: - profiles: test - cloud: - config: - uri: http://127.0.0.1:8002 - ---- - -spring: - profiles: produce - cloud: - config: - uri: http://127.0.0.1:8002 \ No newline at end of file + discovery: + enabled: true + service-id: roses-config-server + +#--- +# +#spring: +# profiles: local +# cloud: +# config: +# enabled: true +# uri: http://127.0.0.1:8002 +# +#--- +# +#spring: +# profiles: dev +# cloud: +# config: +# uri: http://127.0.0.1:8002 +# +#--- +# +#spring: +# profiles: test +# cloud: +# config: +# uri: http://127.0.0.1:8002 +# +#--- +# +#spring: +# profiles: produce +# cloud: +# config: +# uri: http://127.0.0.1:8002 \ No newline at end of file -- Gitee