Skip to content

Commit ecb0387

Browse files
committed
upgrade springboot version and fix eureka security bug
1 parent fecc776 commit ecb0387

File tree

8 files changed

+16
-36
lines changed

8 files changed

+16
-36
lines changed

microservice-spring-cloud/eureka-server/src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ eureka:
99
register-with-eureka: false
1010
fetch-registry: false
1111
serviceUrl:
12-
defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka
12+
defaultZone: http://${security.user.name}:${security.user.password}@${eureka.instance.hostname}:${server.port}/eureka
1313
healthcheck:
1414
enabled: true
1515

microservice-spring-cloud/pom.xml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<packaging>pom</packaging>
1313

1414
<modules>
15-
<module>user-service</module>
15+
<module>user-service-eureka</module>
1616
<module>user-consumer</module>
1717
<module>user-api</module>
1818
<module>eureka-server</module>
@@ -22,23 +22,12 @@
2222
<module>user-consumer-consul</module>
2323
</modules>
2424

25-
<repositories>
26-
<repository>
27-
<id>spring-milestones</id>
28-
<name>Spring Milestones</name>
29-
<url>https://repo.spring.io/libs-milestone</url>
30-
<snapshots>
31-
<enabled>false</enabled>
32-
</snapshots>
33-
</repository>
34-
</repositories>
35-
3625
<dependencyManagement>
3726
<dependencies>
3827
<dependency>
3928
<groupId>org.springframework.cloud</groupId>
4029
<artifactId>spring-cloud-dependencies</artifactId>
41-
<version>Camden.SR6</version>
30+
<version>Dalston.RC1</version>
4231
<type>pom</type>
4332
<scope>import</scope>
4433
</dependency>

microservice-spring-cloud/user-consumer-ribbon/src/main/java/biezhi/HelloWorldApplication.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

microservice-spring-cloud/user-service/pom.xml renamed to microservice-spring-cloud/user-service-eureka/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>user-service</artifactId>
12+
<artifactId>user-service-eureka</artifactId>
1313

1414
<dependencies>
1515

pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>1.4.5.RELEASE</version>
15+
<version>1.5.2.RELEASE</version>
1616
<relativePath/> <!-- lookup parent from repository -->
1717
</parent>
1818

@@ -63,6 +63,17 @@
6363
</dependency>
6464
</dependencies>
6565

66+
<repositories>
67+
<repository>
68+
<id>spring-milestones</id>
69+
<name>Spring Milestones</name>
70+
<url>https://repo.spring.io/milestone</url>
71+
<snapshots>
72+
<enabled>false</enabled>
73+
</snapshots>
74+
</repository>
75+
</repositories>
76+
6677
<build>
6778
<plugins>
6879
<plugin>

0 commit comments

Comments
 (0)