From 8b8b30c9586faf38b44c20c039b12e861174e8d3 Mon Sep 17 00:00:00 2001
From: DaviSantos <davicalixto2077@gmail.com>
Date: Fri, 9 Feb 2024 18:25:34 -0300
Subject: [PATCH] fix: change application.yml

---
 pom.xml                                       | 109 +++++++++++++++++-
 .../daverj/account/config/RabbitMQConfig.java |  24 ----
 src/main/resources/application.yml            |  11 +-
 3 files changed, 106 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/java/com/daverj/account/config/RabbitMQConfig.java

diff --git a/pom.xml b/pom.xml
index 49e5691..79a6abc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.daverj</groupId>
-		<artifactId>daverj-microservices</artifactId>
-		<version>1.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>3.2.2</version>
+		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>com.daverj</groupId>
 	<artifactId>account</artifactId>
 	<version>1.0-SNAPSHOT</version>
-	<name>account</name>
-	<description>Demo project for Spring Boot</description>
+	<name>astfx-account-service</name>
+	<description>Astroflix media's service</description>
 
 	<properties>
 		<java.version>17</java.version>
@@ -27,6 +27,103 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-admin-client</artifactId>
+			<version>22.0.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-client</artifactId>
+			<version>6.2.5.Final</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jackson2-provider</artifactId>
+			<version>6.2.5.Final</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.amqp</groupId>
+			<artifactId>spring-rabbit</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+			<version>3.1.0</version>
+		</dependency>
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<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>
+
+
 </project>
diff --git a/src/main/java/com/daverj/account/config/RabbitMQConfig.java b/src/main/java/com/daverj/account/config/RabbitMQConfig.java
deleted file mode 100644
index 8cce25a..0000000
--- a/src/main/java/com/daverj/account/config/RabbitMQConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.daverj.account.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import constants.RabbitmqConstants;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RabbitMQConfig {
-
-    @Bean
-    public Queue queue() {
-        return new Queue(RabbitmqConstants.QUEUE_REGISTRY_USER, true);
-    }
-
-    @Bean
-    public Jackson2JsonMessageConverter messageConverter() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        return new Jackson2JsonMessageConverter(objectMapper);
-    }
-
-}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 830aec8..855ca0e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,14 +11,9 @@ spring:
   jmx:
     enable: false
   datasource:
-    url: jdbc:mysql://192.168.1.150:3306/PROTO_ACCOUNT?allowPublicKeyRetrieval=true&sslMode=DISABLED
-    username: dba-root
-    password: nUKXQ3C35F2Kcq4_
-  rabbitmq:
-    host: localhost
-    port: 5672
-    username: admin
-    password: 123456
+    url: ${DB_URL:jdbc:mysql://localhost:3306/astfx_account_db?allowPublicKeyRetrieval=true&sslMode=DISABLED}
+    username: ${DB_USER:admin}
+    password: ${DB_PWD:admin}
 
 server:
   port: 8762