diff --git a/.vscode/launch.json b/.vscode/launch.json index 0dd094c1..42a1ceef 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,4 +1,5 @@ { "version": "0.2.0", "configurations": [ + { "type": "java", "name": "Launch MXFileSerializer", @@ -22,6 +23,14 @@ "projectName": "ea-design-it", "vmArgs": " -Dspring.profiles.active=prod" }, + { + "type": "java", + "name": "Launch EaDesignItApp DEV ORACLE", + "request": "launch", + "mainClass": "com.mauvaisetroupe.eadesignit.EaDesignItApp", + "projectName": "ea-design-it", + "vmArgs": " -Dspring.profiles.active=dev,oracle" + }, { "type": "java", "name": "Debug (Launch)", diff --git a/pom.xml b/pom.xml index 791c96c5..088c3bed 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,7 @@ + 1.2.0 3.10.0.2594 2.40.0 @@ -884,7 +885,7 @@ - dev${profile.tls}${profile.no-liquibase} + dev${profile.tls}${profile.no-liquibase}${profile.oracle} testdev org.hibernate.dialect.H2Dialect org.h2.Driver @@ -1037,7 +1038,7 @@ prod - prod${profile.api-docs}${profile.tls}${profile.e2e}${profile.no-liquibase} + prod${profile.api-docs}${profile.tls}${profile.e2e}${profile.no-liquibase}${profile.oracle} testprod org.hibernate.dialect.PostgreSQLDialect org.postgresql.Driver @@ -1130,12 +1131,18 @@ + + oracle + + ,oracle + + tls ,tls - + war diff --git a/src/main/java/com/mauvaisetroupe/eadesignit/config/WebConfigurer.java b/src/main/java/com/mauvaisetroupe/eadesignit/config/WebConfigurer.java index db781a48..cbe82cd1 100644 --- a/src/main/java/com/mauvaisetroupe/eadesignit/config/WebConfigurer.java +++ b/src/main/java/com/mauvaisetroupe/eadesignit/config/WebConfigurer.java @@ -29,6 +29,8 @@ @Configuration public class WebConfigurer implements ServletContextInitializer, WebServerFactoryCustomizer { + private static final String ORACLE = "oracle"; + private final Logger log = LoggerFactory.getLogger(WebConfigurer.class); private final Environment env; @@ -47,7 +49,9 @@ public void onStartup(ServletContext servletContext) throws ServletException { } if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) { - initH2Console(servletContext); + if (!env.acceptsProfiles(Profiles.of(ORACLE))) { + initH2Console(servletContext); + } } log.info("Web application fully configured"); } diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index b736057d..762a6087 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -17,7 +17,7 @@ logging: level: ROOT: INFO tech.jhipster: INFO - org.hibernate.SQL: INFO + org.hibernate.SQL: DEBUG com.mauvaisetroupe.eadesignit: INFO org.hibernate.type.descriptor.sql.BasicBinder: INFO @@ -59,6 +59,14 @@ spring: server: port: 8080 +management: + endpoint: + env: + show-values: when_authorized + configprops: + show-values: when_authorized + additionalKeysToSanitize: password,secret + # =================================================================== # JHipster specific properties # diff --git a/src/main/resources/config/application-oracle.yml b/src/main/resources/config/application-oracle.yml new file mode 100644 index 00000000..585490ca --- /dev/null +++ b/src/main/resources/config/application-oracle.yml @@ -0,0 +1,17 @@ +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + url: jdbc:oracle:thin:@localhost:1521:ORCLCDB + username: EADesignIt + password: EADesignIt + hikari: + poolName: Hikari + auto-commit: false + jpa: + properties: + # when schema not writen in SQL order, random bug : rlation ´flow' does not exist + hibernate.default_schema: + h2: + console: + # disable spring boot built-in h2-console since we start it manually with correct configuration + enabled: false diff --git a/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts b/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts index a750357c..fee9e563 100644 --- a/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts +++ b/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts @@ -25,6 +25,8 @@ export default defineComponent({ const openAPIEnabled = computed(() => store.activeProfiles.indexOf('api-docs') > -1); const inProduction = computed(() => store.activeProfiles.indexOf('prod') > -1); + const h2Database = computed(() => store.activeProfiles.indexOf('oracle') < 0); + const authenticated = computed(() => store.authenticated); const adminAuthorities = computed(() => store.adminAuthority); const readAuthorities = computed(() => accountService.readAuthorities); @@ -62,6 +64,7 @@ export default defineComponent({ authenticated, adminAuthorities, readAuthorities, + h2Database, }; }, methods: { diff --git a/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue b/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue index d6c9f131..b2339a01 100644 --- a/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue +++ b/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue @@ -143,7 +143,7 @@ API - + Database