diff --git a/eatsnowsoap/db/db.sql b/eatsnowsoap/db/db.sql index 5a1e35cb39ad868ff719c5f858c9029cf7a7c9d7..eec22c4a9ce6a98346dcce1c6b7bd2c03f4ff606 100644 --- a/eatsnowsoap/db/db.sql +++ b/eatsnowsoap/db/db.sql @@ -11,7 +11,7 @@ CREATE TABLE review ( review_id INT AUTO_INCREMENT PRIMARY KEY, content TEXT NOT NULL, rating FLOAT NOT NULL, - id_user INT NOT NULL, + email VARCHAR(255) NOT NULL, name_user VARCHAR(255) NOT NULL, profile_img VARCHAR(255) NOT NULL, id_restaurant INT NOT NULL diff --git a/eatsnowsoap/docker-compose.yml b/eatsnowsoap/docker-compose.yml index 38113685e120855365fc21a8406474daa7f9a87a..56381896d2b0249dbf39865718b8547a0110f677 100644 --- a/eatsnowsoap/docker-compose.yml +++ b/eatsnowsoap/docker-compose.yml @@ -3,7 +3,7 @@ services: soap-db: image: mysql:latest ports: - - "3307:3306" + - "3309:3306" volumes: - ./db:/docker-entrypoint-initdb.d environment: diff --git a/eatsnowsoap/dockerfile b/eatsnowsoap/dockerfile index 10fc77d1d146c243815525eb761ab729793e611e..b3f5917d80adb80d5e76dc06c59780ba54cb28f6 100644 --- a/eatsnowsoap/dockerfile +++ b/eatsnowsoap/dockerfile @@ -5,8 +5,10 @@ WORKDIR /app COPY src ./src COPY pom.xml . COPY target ./target -COPY .env /app/.env +COPY .env . RUN mvn clean install -X +EXPOSE 8020 + CMD ["mvn", "exec:java"] \ No newline at end of file diff --git a/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java b/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java index 2a48a4c88c3cc48a6ef2799ef7833ecebb37f94a..d0128599d2a71809ace5227771933a11b0be650e 100644 --- a/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java +++ b/eatsnowsoap/src/main/java/com/eatsnowsoap/core/Database.java @@ -8,8 +8,8 @@ public class Database { private Connection connection; private Dotenv dotenv = Dotenv.load(); private String DB_URL = dotenv.get("DB_URL"); - private String DB_USER = dotenv.get("DB_USER"); - private String DB_PASS = dotenv.get("DB_PASS"); + private String DB_USER = dotenv.get("MYSQL_USER"); + private String DB_PASS = dotenv.get("MYSQL_PASSWORD"); public Database(){ try{