Browse Source

fix: .env is now beening loaded

EduLascala 1 month ago
parent
commit
68ce658b33

+ 5 - 0
pom.xml

@@ -97,6 +97,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>me.paulschwarz</groupId>
+            <artifactId>spring-dotenv</artifactId>
+            <version>4.0.0</version>
+        </dependency>
 
     </dependencies>
 

+ 31 - 0
src/main/java/com/platform2easy/genesis/web/dto/CompanyWithUserDTO.java

@@ -0,0 +1,31 @@
+package com.platform2easy.genesis.web.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CompanyWithUserDTO {
+
+    // Dados da empresa
+    private String companyName;
+
+    // Dados do usuário
+    private String userName;
+    private String userEmail;
+    private String userPassword;
+    private String userPhone;
+    private String userAddress;
+    private String userCity;
+    private String userState;
+    private String userZip;
+    private String userCountry;
+    private Integer userKyc;
+    private Integer userBirthdate;
+    private String userCpf;
+    private Integer roleId;
+}

+ 0 - 1
src/main/resources/application-postgres.properties

@@ -3,7 +3,6 @@ spring.application.name=genesis
 server.port=${SERVER_PORT:8081}
 
 api.security.token.secret=${JWT_SECRET}
-
 spring.datasource.url=${DB_URL}
 spring.datasource.username=${DB_USERNAME}
 spring.datasource.password=${DB_PASSWORD}

+ 12 - 16
src/main/resources/application.properties

@@ -1,23 +1,19 @@
 spring.application.name=genesis
 
 server.port=${SERVER_PORT:8081}
-server.error.whitelabel.enabled=false
-server.error.include-message=never
 
-api.security.token.secret=${JWT_SECRET:my-secret-key}
+api.security.token.secret=${JWT_SECRET}
+spring.datasource.url=${DB_URL}
+spring.datasource.username=${DB_USERNAME}
+spring.datasource.password=${DB_PASSWORD}
+spring.datasource.driver-class-name=org.postgresql.Driver
 
-#datasource
-spring.datasource.url=jdbc:h2:mem:banco
-spring.datasource.username=sa
-spring.datasource.password=
-spring.datasource.driver-class-name=org.h2.Driver
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.hibernate.ddl-auto=none
 
-#JPA
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.jpa.hibernate.ddl-auto=update
-
-#h2
-spring.h2.console.enabled=true
-spring.h2.console.path=/banco
-spring.main.allow-bean-definition-overriding=true
 spring.flyway.enabled=false
+
+# Aqui configuramos o Spring pra rodar suas migrations SQL manualmente
+spring.sql.init.mode=never
+spring.sql.init.schema-locations=classpath:db/migration/postgresql/V1__init.sql
+spring.sql.init.data-locations=classpath:db/migration/postgresql/V2__seed_company_role.sql