diff --git a/.env.xmpl b/.env.xmpl new file mode 100644 index 0000000000000000000000000000000000000000..4fa48240b2835ed17ebb46212f7285e919af3ff2 --- /dev/null +++ b/.env.xmpl @@ -0,0 +1,3 @@ +DB_URL=jdbc:mysql://localhost:3306/toco_soap +DB_USERNAME=toco +DB_PASSWORD=toco \ No newline at end of file diff --git a/dockerfile b/dockerfile index 5c648145d6c63bf8e8348abe1cd81f18a58938e8..f46acab1952d6c2840e399614bd41455371a3fc8 100644 --- a/dockerfile +++ b/dockerfile @@ -7,6 +7,7 @@ WORKDIR /app COPY src ./src COPY pom.xml . +COPY .env . COPY target ./target RUN mvn clean package diff --git a/pom.xml b/pom.xml index 1d2fd781bcc55b0ac712d616fb93f8ff43a407df..381713677f68fb55bff2a00a958dcde0f67b7905 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,11 @@ <artifactId>spring-web</artifactId> <version>6.0.13</version> </dependency> + <dependency> + <groupId>io.github.cdimascio</groupId> + <artifactId>java-dotenv</artifactId> + <version>5.2.2</version> + </dependency> </dependencies> diff --git a/src/main/java/org/toco/core/connector.java b/src/main/java/org/toco/core/connector.java index bf40e4c199bf5200e84f5bb548d976db9700707b..b6e6be79046cbaa8c33d00dc4385cc6ee230256a 100644 --- a/src/main/java/org/toco/core/connector.java +++ b/src/main/java/org/toco/core/connector.java @@ -2,16 +2,19 @@ package org.toco.core; import java.sql.*; +import io.github.cdimascio.dotenv.Dotenv; + public class connector { public static Connection connect() { - String user = "toco"; - String password = "toco"; - String url = "jdbc:mysql://toco-soap-db:3306/toco_soap"; + Dotenv dotenv = Dotenv.load(); + String DB_URL = dotenv.get("DB_URL"); + String DB_USERNAME = dotenv.get("DB_USERNAME"); + String DB_PASSWORD = dotenv.get("DB_PASSWORD"); try { Class.forName("com.mysql.cj.jdbc.Driver"); System.out.println("Driver loaded!"); - Connection connection = DriverManager.getConnection(url, user, password); + Connection connection = DriverManager.getConnection(DB_URL, DB_USERNAME, DB_PASSWORD); System.out.println("Connected to the database"); return connection; // Return the connection before closing