Merge branch 'staging' into develop

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

.gitignore

@@ -96,4 +96,5 @@ TODO.txt
 /jeus-tibero/
 *.zip
 /src/docs/
-/docs/
+/docs/
+src/main/resources/application-gf63.yml

src/main/resources/application-dev.yml

@@ -44,8 +44,8 @@ gateway:
     serverName: 192.168.240.177
     portNumber: 1599
     databaseName: DAPM
-    username: EMSADM
+    username: AGWADM
-    password: EMSADM123!
+    password: AGWADM123!
 
 #    serverName: 172.20.160.59
 #    portNumber: 3317

src/main/resources/application-gf63.yml

@@ -24,31 +24,19 @@ spring:
 
 ems:
   datasource:
-    serverName: localhost
+    serverName: 192.168.240.177
-    portNumber: 3306
+    portNumber: 1599
-    databaseName: ndapims
+    databaseName: DAPM
-    username: api_app
+    username: EMSADM
-    password: from2408!@
+    password: EMSADM123!
-
-#    serverName: 172.20.160.59
-#    portNumber: 3317
-#    databaseName: ndapims
-#    username: api_app
-#    password: Tapiapp*17
 
 gateway:
   datasource:
-    serverName: localhost
+    serverName: 192.168.240.177
-    portNumber: 3306
+    portNumber: 1599
-    databaseName: ndapigw
+    databaseName: DAPM
-    username: api_app
+    username: AGWADM
-    password: from2408!@
+    password: AGWADM123!
-
-#    serverName: 172.20.160.59
-#    portNumber: 3317
-#    databaseName: ndapigw
-#    username: api_app
-#    password: Tapiapp*17
 
 
 proxy: