Explorar el Código

login working

Kate Moore hace 5 años
padre
commit
cf32671355

+ 2
- 1
src/main/resources/config/application-dev.yml Ver fichero

@@ -49,9 +49,10 @@ spring:
49 49
         password:
50 50
         hikari:
51 51
             auto-commit: false
52
+        platform: h2
52 53
     h2:
53 54
         console:
54
-            enabled: false
55
+            enabled: true
55 56
     jpa:
56 57
         database-platform: io.github.jhipster.domain.util.FixedH2Dialect
57 58
         database: H2

+ 2
- 3
src/main/resources/config/application.yml Ver fichero

@@ -66,10 +66,9 @@ spring:
66 66
         properties:
67 67
             hibernate.jdbc.time_zone: UTC
68 68
         hibernate:
69
-<<<<<<< HEAD
70
-=======
69
+
71 70
             ddl-auto: none
72
->>>>>>> e643360c0b2a6c07e30a791e98c6c624e8cc0a81
71
+
73 72
             naming:
74 73
                 physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
75 74
                 implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy