Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	src/main/resources/application.yml

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
   servlet.context-path: ${APPLICATION_PATH:/bytebot}
   port: ${APPLICATION_PORT:9077}
   web:
-    static-content-location: file:/home/asarmiento/Escritorio/REPARANDO/bytebot-workspace/dist/bytebot-html/
+    static-content-location: file:/home/cristian/Documents/AVB_Backend/bytebot-html/
 #NOTA debe terminar con /
 
 security:
@@ -120,11 +120,11 @@ spring:
     oauth2-client:
       clientId: xdf-client
       clientSecret: xdf-secret
-      accessTokenUri: http://192.168.21.49:18080/oauth/token
-      userAuthorizationUri: http://192.168.21.49:18080/oauth/authorize
+      accessTokenUri: http://192.168.1.6:18080/oauth/token
+      userAuthorizationUri: http://192.168.1.6:18080/oauth/authorize
     oauth2-resource:
-      userInfoUri: http://192.168.21.49:18080/oauth/userinfo
-      logoutUri: http://192.168.21.49:18080/oauth/userlogout
+      userInfoUri: http://192.168.1.6:18080/oauth/userinfo
+      logoutUri: http://192.168.1.6:18080/oauth/userlogout
   tenants:
     -
       id: T186A1
@@ -142,16 +142,16 @@ spring:
         testWhileIdle: true
         hikari.registerMbeans: true
       security:
-        basepath: http://localhost:9077/bytebot
+        basepath: http://192.168.1.6:9077/bytebot
         provider: byte # oracle, amazon
         oauth2-client:
           clientId: xdf-client
           clientSecret: xdf-secret
-          accessTokenUri: http://192.168.21.49:18080/oauth/token
-          userAuthorizationUri: http://192.168.21.49:18080/oauth/authorize
+          accessTokenUri: http://192.168.1.6:18080/oauth/token
+          userAuthorizationUri: http://192.168.1.6:18080/oauth/authorize
         oauth2-resource:
-          userInfoUri: http://192.168.21.49:18080/oauth/userinfo
-          logoutUri: http://192.168.21.49:18080/oauth/userlogout
+          userInfoUri: http://192.168.1.6:18080/oauth/userinfo
+          logoutUri: http://192.168.1.6:18080/oauth/userlogout
 
 
   jpa:
@@ -175,7 +175,7 @@ batch:
         jdbc-driver: 'org.postgresql.Driver'
         username: postgres
         password:
-        jdbc-url: jdbc:postgresql://192.168.21.74:5432/broker_rasa_db?useSSL=false
+        jdbc-url: jdbc:postgresql://192.168.21.74:5432/avb?useSSL=false
         query: 'select * from events WHERE id > %d order by id asc'
 
 logging.level.root: DEBUG