Merge pull request #14 from mehmetpekdemir/develop

Develop
mehmetpekdemir · Sep 1, 2020 · a0cb77b · a0cb77b
2 parents 4d207e6 + 0b61792
commit a0cb77b
Show file tree

Hide file tree

Showing 31 changed files with 605 additions and 87 deletions.
diff --git a/account-service/pom.xml b/account-service/pom.xml
@@ -33,10 +33,49 @@
 
 	<build>
 		<plugins>
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.26.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<verbose>true</verbose>
+					<images>
+						<image>
+							<name>${project.artifactId}:${project.version}</name>
+							<build>
+								<from>adoptopenjdk/openjdk11</from>
+								<entryPoint>
+									<exec>
+										<args>java</args>
+										<args>-jar</args>
+										<args>/maven/${project.artifactId}-${project.version}.jar</args>
+									</exec>
+								</entryPoint>
+								<assembly>
+									<descriptorRef>artifact</descriptorRef>
+								</assembly>
+							</build>
+						</image>
+					</images>
+				</configuration>
+				<executions>
+					<execution>
+						<id>build</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 

diff --git a/account-service/src/main/java/com/mehmetpekdemir/accountservice/api/AccountAPI.java b/account-service/src/main/java/com/mehmetpekdemir/accountservice/api/AccountAPI.java
@@ -24,9 +24,6 @@
 import lombok.RequiredArgsConstructor;
 
 /**
- * <p>
- * Port: localhost: 8501
- * </p>
  * 
  * @author MEHMET PEKDEMIR
  * @since 1.0

diff --git a/account-service/src/main/resources/bootstrap.yml b/account-service/src/main/resources/bootstrap.yml
@@ -1,7 +1,9 @@
 spring:
+
   application:
     name: account-service
+
   cloud:
     config:
       profile: native
-      uri: http://localhost:8888
+      uri: ${CONFIG_SERVER_URL:http://localhost:8888}
diff --git a/...rvice/src/test/java/com/mehmetpekdemir/accountservice/AccountServiceApplicationTests.java b/...rvice/src/test/java/com/mehmetpekdemir/accountservice/AccountServiceApplicationTests.java
diff --git a/admin-server/pom.xml b/admin-server/pom.xml
@@ -36,10 +36,49 @@
 
 	<build>
 		<plugins>
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.26.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<verbose>true</verbose>
+					<images>
+						<image>
+							<name>${project.artifactId}:${project.version}</name>
+							<build>
+								<from>adoptopenjdk/openjdk11</from>
+								<entryPoint>
+									<exec>
+										<args>java</args>
+										<args>-jar</args>
+										<args>/maven/${project.artifactId}-${project.version}.jar</args>
+									</exec>
+								</entryPoint>
+								<assembly>
+									<descriptorRef>artifact</descriptorRef>
+								</assembly>
+							</build>
+						</image>
+					</images>
+				</configuration>
+				<executions>
+					<execution>
+						<id>build</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 

diff --git a/admin-server/src/main/resources/application.yml b/admin-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8508
+  port: ${SERVER_PORT:8508}
 
 spring:
   application:
@@ -14,7 +14,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: ${EUREKA_SERVICE_URL:http://localhost:8500}/eureka/
+      defaultZone: ${EUREKA_SERVICE_URL:http://localhost:8500}/eureka/}
 
 management:
   endpoints:

diff --git a/common-service/pom.xml b/common-service/pom.xml
@@ -12,17 +12,17 @@
 		<groupId>com.mehmetpekdemir</groupId>
 		<artifactId>microservice-app</artifactId>
 		<version>1.0.1</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-
 	<dependencies>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-feign</artifactId>
 			<version>1.4.7.RELEASE</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-cassandra</artifactId>
@@ -33,7 +33,7 @@
 			<artifactId>metrics-core</artifactId>
 			<version>3.0.2</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

diff --git a/config-server/pom.xml b/config-server/pom.xml
@@ -2,29 +2,73 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<artifactId>config-server</artifactId>
+	<name>config-server</name>
+	<description>Config Server</description>
+	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>com.mehmetpekdemir</groupId>
 		<artifactId>microservice-app</artifactId>
 		<version>1.0.1</version>
-		<relativePath />
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
 		</dependency>
+
 	</dependencies>
 
 	<build>
 		<plugins>
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.26.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<verbose>true</verbose>
+					<images>
+						<image>
+							<name>${project.artifactId}:${project.version}</name>
+							<build>
+								<from>adoptopenjdk/openjdk11</from>
+								<entryPoint>
+									<exec>
+										<args>java</args>
+										<args>-jar</args>
+										<args>/maven/${project.artifactId}-${project.version}.jar</args>
+									</exec>
+								</entryPoint>
+								<assembly>
+									<descriptorRef>artifact</descriptorRef>
+								</assembly>
+							</build>
+						</image>
+					</images>
+				</configuration>
+				<executions>
+					<execution>
+						<id>build</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 

diff --git a/config-server/src/main/resources/bootstrap.yml b/config-server/src/main/resources/bootstrap.yml
@@ -1,11 +1,14 @@
 server:
-  port: 8888
+  port: ${SERVER_PORT:8888}
 
 spring:
   cloud:
     config:
       server:
+        git:
+          uri: 
         native:
           search-locations: classpath:/microserviceconfig
+
   profiles:
     active: native
diff --git a/config-server/src/main/resources/microserviceconfig/account-service.yml b/config-server/src/main/resources/microserviceconfig/account-service.yml
@@ -6,12 +6,12 @@ spring:
   application:
     name: account-service
   zipkin: 
-    base-url: http://localhost:9411/
+    base-url: ${ZIPKIN_SERVER_URL:http://localhost:9411}
 
   boot:
     admin:
       client:
-        url: http://localhost:8508
+        url: ${SPRING_BOOT_ADMIN_SERVER_URL:http://localhost:8508}
 
 management:
   endpoints:
@@ -22,20 +22,25 @@ management:
 spcloud:
   cassandra:
     keyspace:
-      name: springcloud
-    port: 9042
+      name: ${CASSANDRA_SERVER_KEYSPACE:springcloud}
+
+    port: ${CASSANDRA_SERVER_PORT:9042}
+
     contact:
-      point: 127.0.0.1
+      point: ${CASSANDRA_SERVER_HOST:localhost}
+
     getEntityBasePackages: com.mehmetpekdemir.commonservice
-    username: cassandra
-    password: cassandra
+
+    username: ${CASSANDRA_SERVER_USERNAME:cassandra}
+    password: ${CASSANDRA_SERVER_USERNAME:cassandra}
 
 
 eureka:
   client:
     instance:
-      hostname: localhost
+      hostname: ${EUREKA_SERVER_HOSTNAME:localhost}
+
     serviceUrl:
-      defaultZone: http://localhost:8500/eureka/
+      defaultZone: ${EUREKA_SERVER_URL:http://localhost:8500/eureka/}
 
 
diff --git a/config-server/src/main/resources/microserviceconfig/eureka-server.yml b/config-server/src/main/resources/microserviceconfig/eureka-server.yml
@@ -5,13 +5,14 @@ server:
 spring:
   application:
     name: eureka-server
+
   zipkin: 
-    base-url: http://localhost:9411/
+    base-url: ${ZIPKIN_SERVER_URL:http://localhost:9411/}
 
   boot:
     admin:
       client:
-        url: http://localhost:8508
+        url: ${SPRING_BOOT_ADMIN_SERVER_URL:http://localhost:8508}
 
 management:
   endpoints:
@@ -24,9 +25,9 @@ eureka:
   server:
     eviction-interval-timer-in-ms: 1000
   instance:
-    hostname: localhost
+    hostname: ${EUREKA_SERVER_HOST:localhost}
   client:
     registerWithEureka: true
     fetchRegistry: true
     serviceUrl:
-      defaultZone: http://localhost:8500/eureka/
+      defaultZone: ${EUREKA_SERVER_URL:http://localhost:8500/eureka/}
diff --git a/config-server/src/main/resources/microserviceconfig/notification-service.yml b/config-server/src/main/resources/microserviceconfig/notification-service.yml
@@ -11,7 +11,7 @@ spring:
   boot:
     admin:
       client:
-        url: http://localhost:8508
+        url: ${SPRING_BOOT_ADMIN_SERVER_URL:http://localhost:8508}
 
 management:
   endpoints:
@@ -35,6 +35,6 @@ management:
 eureka:
   client:
     instance:
-      hostname: localhost
+      hostname: ${EUREKA_SERVER_HOST:localhost}
     serviceUrl:
-      defaultZone: http://localhost:8500/eureka/
+      defaultZone: ${EUREKA_SERVER_URL:http://localhost:8500/eureka/}