Merge branch 'staging' into develop

# Conflicts: # src/main/resources/application-dev.yml
2025-09-09 11:27:26 +09:00
parent bdaf89b5e6 4e5a9d8ed6
commit 05931146e4
3 changed files with 14 additions and 25 deletions
@@ -96,4 +96,5 @@ TODO.txt
 /jeus-tibero/
 *.zip
 /src/docs/
-/docs/
+/docs/
+src/main/resources/application-gf63.yml
@@ -44,8 +44,8 @@ gateway:
    serverName: 192.168.240.177
    portNumber: 1599
    databaseName: DAPM
-    username: EMSADM
-    password: EMSADM123!
+    username: AGWADM
+    password: AGWADM123!

 #    serverName: 172.20.160.59
 #    portNumber: 3317
@@ -24,31 +24,19 @@ spring:

 ems:
  datasource:
-    serverName: localhost
-    portNumber: 3306
-    databaseName: ndapims
-    username: api_app
-    password: from2408!@
-
-#    serverName: 172.20.160.59
-#    portNumber: 3317
-#    databaseName: ndapims
-#    username: api_app
-#    password: Tapiapp*17
+    serverName: 192.168.240.177
+    portNumber: 1599
+    databaseName: DAPM
+    username: EMSADM
+    password: EMSADM123!

 gateway:
  datasource:
-    serverName: localhost
-    portNumber: 3306
-    databaseName: ndapigw
-    username: api_app
-    password: from2408!@
-
-#    serverName: 172.20.160.59
-#    portNumber: 3317
-#    databaseName: ndapigw
-#    username: api_app
-#    password: Tapiapp*17
+    serverName: 192.168.240.177
+    portNumber: 1599
+    databaseName: DAPM
+    username: AGWADM
+    password: AGWADM123!


 proxy: