fix: change application.yml

DaveScott99 · Feb 9, 2024 · 8b8b30c · 8b8b30c
1 parent 7341668
commit 8b8b30c
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 38 deletions.
diff --git 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
diff --git 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