diff --git a/pom.xml b/pom.xml
index c1fa578ff9b9c5eccfde90da6915115a13b3f7db..7cf460ec0044c09caaf5329345db2ad3b6019990 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.3.1
@@ -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}
diff --git a/roses-config-server/pom.xml b/roses-config-server/pom.xml
index 38ff07fd923d527d1e85dacfd044ab100f8387b9..31f4093dbf3862ee3941580ab8355d094fb0eedd 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 cd5d8f1cd6950f7b6ef7af459c72e98ab666452c..f4cbbd21783cee15f6ddae47bbd4f6eebd7a80b4 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@
@@ -25,16 +25,26 @@ 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: /**
- 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 #重新刷新服务地址的时间
---
@@ -45,7 +55,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 +75,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: /**
diff --git a/roses-spring-boot-admin/src/main/resources/bootstrap.yml b/roses-spring-boot-admin/src/main/resources/bootstrap.yml
index d069f1a6763b489bef76f5acef96289166ac0f73..1fc1ed9a6c0a820aa686337749bf0a0789a44826 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