Multiple instances #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Canzerbero007 wants to merge 42 commits into master from multiple-instances

car-service/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,20 +1,20 @@
  
    <?xml version="1.0" encoding="UTF-8"?>

    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

    	<modelVersion>4.0.0</modelVersion>

    	<parent>

    		<groupId>org.springframework.boot</groupId>

    		<artifactId>spring-boot-starter-parent</artifactId>

    		<version>2.7.5</version>

    		<relativePath/> <!-- lookup parent from repository -->

    		<version>2.5.4</version>

    		<relativePath /> <!-- lookup parent from repository -->

    	</parent>

    	<groupId>car-service</groupId>

    	<groupId>com.car.service</groupId>

    	<artifactId>car-service</artifactId>

    	<version>1.0</version>

    	<name>car-service</name>

    	<description>Demo project for Spring Boot</description>

    	<properties>

    		<java.version>17</java.version>

    		<spring-cloud.version>2020.0.3</spring-cloud.version>

    	</properties>

    	<dependencies>

    		<dependency>

    @@ -25,7 +25,6 @@
  
    			<groupId>org.springframework.boot</groupId>

    			<artifactId>spring-boot-starter-web</artifactId>

    		</dependency>

    		<dependency>

    			<groupId>org.springframework.boot</groupId>

    			<artifactId>spring-boot-devtools</artifactId>

    @@ -42,8 +41,34 @@
  
    			<artifactId>spring-boot-starter-test</artifactId>

    			<scope>test</scope>

    		</dependency>

    		<dependency>

    			<groupId>org.springframework.cloud</groupId>

    			<artifactId>spring-cloud-starter-config</artifactId>

    		</dependency>

    		<dependency>

    			<groupId>org.springframework.cloud</groupId>

    			<artifactId>spring-cloud-starter-bootstrap</artifactId>

    		</dependency>

    		<dependency>

    			<groupId>org.springframework.cloud</groupId>

    			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

    		</dependency>

    		<dependency>

    			<groupId>org.springframework.boot</groupId>

    			<artifactId>spring-boot-starter-actuator</artifactId>

    		</dependency>

    	</dependencies>

    	<dependencyManagement>

    		<dependencies>

    			<dependency>

    				<groupId>org.springframework.cloud</groupId>

    				<artifactId>spring-cloud-dependencies</artifactId>

    				<version>${spring-cloud.version}</version>

    				<type>pom</type>

    				<scope>import</scope>

    			</dependency>

    		</dependencies>

    	</dependencyManagement>

    	<build>

    		<plugins>

    			<plugin>

    @@ -52,5 +77,4 @@
  
    			</plugin>

    		</plugins>

    	</build>

    </project>

car-service/src/main/java/com/car/service/CarServiceApplication.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,9 @@ @@
     import org.springframework.boot.SpringApplication;
     import org.springframework.boot.autoconfigure.SpringBootApplication;
+    import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+    @EnableEurekaClient
     @SpringBootApplication
     public class CarServiceApplication {
@@ Expand Down @@

car-service/src/main/java/com/car/service/controller/CarController.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     import java.util.List;
     import org.springframework.beans.factory.annotation.Autowired;
+    import org.springframework.cloud.context.config.annotation.RefreshScope;
     import org.springframework.http.ResponseEntity;
     import org.springframework.stereotype.Controller;
     import org.springframework.web.bind.annotation.GetMapping;
@@ Expand All / @@ -14,6 +15,7 @@ @@
     import com.car.service.entity.Car;
     import com.car.service.service.CarService;
+    @RefreshScope
     @Controller
     @RequestMapping("/car")
     public class CarController {
@@ Expand Down @@

car-service/src/main/java/com/car/service/entity/Car.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,28 @@ public class Car { @@
     	public Car() {
     		super();
     	}
+    	public int getId() {
+    		return id;
+    	}
+    	public void setId(int id) {
+    		this.id = id;
+    	}
+    	public String getBrand() {
+    		return brand;
+    	}
+    	public void setBrand(String brand) {
+    		this.brand = brand;
+    	}
+    	public String getModel() {
+    		return model;
+    	}
+    	public void setModel(String model) {
+    		this.model = model;
+    	}
+    	public int getUserId() {
+    		return userId;
+    	}
+    	public void setUserId(int userId) {
+    		this.userId = userId;
+    	}
     }

car-service/src/main/resources/application.properties

This file was deleted.

car-service/src/main/resources/bootstrap.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    spring:
+      application:
+        name: car-service
+      cloud:
+        config:
+          enabled: true
+          uri: http://localhost:8081

config-data/car-service.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    server:
+      port: ${PORT:${SERVER_PORT:0}}
+    eureka:
+      client:
+        fetch-registry: true
+        register-with-eureka: true
+        service-url:
+          default-zone: http://localhost:8761/eureka
+      instance:
+        instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}}

config-data/eureka-service.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    server:
+      port: 8761
+    eureka:
+      client:
+        fetch-registry: false
+        register-with-eureka: false
+        service-url:
+          default-zone: http://${eureka.instance.hostname}:${server.port}/eureka/

config-data/motorbike-service.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    server:
+      port: ${PORT:${SERVER_PORT:0}}
+    eureka:
+      client:
+        fetch-registry: true
+        register-with-eureka: true
+        service-url:
+          default-zone: http://localhost:8761/eureka
+      instance:
+        instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}}

config-data/user-service.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    server:
+      port: ${PORT:${SERVER_PORT:0}}
+    eureka:
+      client:
+        fetch-registry: true
+        register-with-eureka: true
+        service-url:
+          default-zone: http://localhost:8761/eureka
+      instance:
+        instance-id: ${spring.application.name}:${spring.application.instance_id:${random.value}}

config-service/.gitignore

-Original file line number
+Diff line change
@@ -0,0 +1,33 @@
+    HELP.md
+    target/
+    !.mvn/wrapper/maven-wrapper.jar
+    !**/src/main/**/target/
+    !**/src/test/**/target/
+    ### STS ###
+    .apt_generated
+    .classpath
+    .factorypath
+    .project
+    .settings
+    .springBeans
+    .sts4-cache
+    ### IntelliJ IDEA ###
+    .idea
+    *.iws
+    *.iml
+    *.ipr
+    ### NetBeans ###
+    /nbproject/private/
+    /nbbuild/
+    /dist/
+    /nbdist/
+    /.nb-gradle/
+    build/
+    !**/src/main/**/build/
+    !**/src/test/**/build/
+    ### VS Code ###
+    .vscode/

config-service/.mvn/wrapper/maven-wrapper.jar

Binary file not shown.

config-service/.mvn/wrapper/maven-wrapper.properties

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
		wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multiple instances #11

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Multiple instances #11

Are you sure you want to change the base?

Uh oh!

Multiple instances #11

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!