diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java index 639d7b23bc8d5204159838ae05230f4a65be85ee..2a2d9d8b69f48cc6f0ae24f2a9592cc5ce2e79dd 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java @@ -39,6 +39,6 @@ public class Product{ @Column(name = "best_before") int bestBefore; - @Column(name = "expirationDate") + @Column(name = "expiration_date") int expirationDate; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bef07f681b183f9b50471f2a6970a5798388072e..f1ec6079f5d4cf0794bde9761936b103a2bbaddb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -28,4 +28,7 @@ spring.jpa.hibernate.ddl-auto = update # Run spring boot locally/network-wide # Uncomment to run network-wide. #server.address=0.0.0.0 -#server.port=8080 \ No newline at end of file +#server.port=8080 + +# Kassal.app +# Authorization: Bearer MM4a9dkytHAMlx2APMALVgjCAWH8zzK4gRx94Pay \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties index ba7e37ce97efe8800019b8643c642a1f1746bca4..f1ec6079f5d4cf0794bde9761936b103a2bbaddb 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -23,4 +23,12 @@ spring.jpa.hibernate.ddl-auto = update # Password: Eyhs1OJxyZC56NQCrV7yAolEk9AkLAsC # Internal Database URl (from render): postgres://smartmat_user:Eyhs1OJxyZC56NQCrV7yAolEk9AkLAsC@dpg-cgv5710dh87i4q0fd1b0-a/smartmat # External Database URL: postgres://smartmat_user:Eyhs1OJxyZC56NQCrV7yAolEk9AkLAsC@dpg-cgv5710dh87i4q0fd1b0-a.frankfurt-postgres.render.com/smartmat -# PSQL Command: PGPASSWORD=Eyhs1OJxyZC56NQCrV7yAolEk9AkLAsC psql -h dpg-cgv5710dh87i4q0fd1b0-a.frankfurt-postgres.render.com -U smartmat_user smartmat \ No newline at end of file +# PSQL Command: PGPASSWORD=Eyhs1OJxyZC56NQCrV7yAolEk9AkLAsC psql -h dpg-cgv5710dh87i4q0fd1b0-a.frankfurt-postgres.render.com -U smartmat_user smartmat + +# Run spring boot locally/network-wide +# Uncomment to run network-wide. +#server.address=0.0.0.0 +#server.port=8080 + +# Kassal.app +# Authorization: Bearer MM4a9dkytHAMlx2APMALVgjCAWH8zzK4gRx94Pay \ No newline at end of file