ok

nokia-wroclaw · Sep 22, 2020 · dcd4621 · dcd4621
1 parent 47e192f
commit dcd4621
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/front/default.conf b/front/default.conf
@@ -1,5 +1,5 @@
 server {
-  listen 4200;
+  listen $PORT;
   location / {
     root /usr/share/nginx/html;
     index index.html index.htm;

diff --git a/front/e2e/protractor.conf.js b/front/e2e/protractor.conf.js
@@ -16,7 +16,7 @@ exports.config = {
     browserName: 'chrome'
   },
   directConnect: true,
-  baseUrl: 'http://localhost:4200/',
+  baseUrl: 'https://nokia3s-front.herokuapp.com/',
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,

diff --git a/front/package.json b/front/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --port $PORT --host 0.0.0.0 --disable-host-check",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",

diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties
@@ -1,12 +1,20 @@
 
 
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
+
+
 spring.datasource.url = jdbc:mysql://localhost:3306/db3s
 #?useSSL=false
 spring.datasource.username = root
 spring.datasource.password = 1q2w3e4r
+
+spring.datasource.hikari.connectionTimeout=30000
+spring.datasource.hikari.idleTimeout=600000
+spring.datasource.hikari.maxLifetime=27000000
+
 spring.session.jdbc.initialize-schema: always
 
+
 ## Hibernate Properties
 # The SQL dialect makes Hibernate generate better SQL for the chosen database
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect