diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 8e8180c..e2156df 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -25,9 +25,45 @@
 
     <!-- url: The JDBC connection url for connecting to your MySQL database.
          -->
+<<<<<<< HEAD
   <Resource name="jdbc/dsOBP_AGW" auth="Container" type="javax.sql.DataSource"
                maxTotal="10" maxIdle="10" maxWaitMillis="10000"
                username="AGWAPP" password="AGWAPP123!" driverClassName="oracle.jdbc.OracleDriver"
                url="jdbc:oracle:thin:@192.168.240.177:1599:DAPM"/>
+=======
+    <!-- 
+  	<Resource name="NDAPIGW_APP_NXA" auth="Container" type="javax.sql.DataSource"
+               maxTotal="10" initialSize="10" maxIdle="10" maxActive="10" maxWaitMillis="10000"
+               poolPreparedStatements="true" validationQuery="SELECT 1" validationInterval="600000"
+               username="apigw" password="apigw" driverClassName="com.mysql.jdbc.Driver"
+               url="jdbc:mysql://192.168.8.30:13306/apigw"/>
+     -->
+     <!-- APIGW myPC MySql 5.7  -->
+
+     <Resource name="jndi/dsAPIGW" auth="Container" type="javax.sql.DataSource"
+               maxTotal="10" initialSize="10" maxIdle="10" maxActive="10" maxWaitMillis="10000"
+               poolPreparedStatements="true" validationQuery="SELECT 1" validationInterval="600000"
+               username="apigw" password="apigw" driverClassName="com.mysql.cj.jdbc.Driver"
+               url="jdbc:mysql://localhost:3306/apigw"/>
+
+
+               
+    <!-- APIGW -->
+    <!--  
+	<Resource name="jndi/dsAPIGW" auth="Container" type="javax.sql.DataSource"
+               maxTotal="10" maxIdle="10" maxWaitMillis="10000"
+               username="apigw" password="apigw1234" driverClassName="oracle.jdbc.OracleDriver"
+               url="jdbc:oracle:thin:@//localhost:1521/XE"/>
+    -->
+    
+    <!-- APIGW 유차장 ORACLE-->
+
+    <Resource name="jdbc/dsOBP_AGW" auth="Container" type="javax.sql.DataSource"
+               maxTotal="10" maxIdle="10" maxWaitMillis="10000"
+               username="AGWAPP" password="AGWAPP123!" driverClassName="oracle.jdbc.OracleDriver"
+               url="jdbc:oracle:thin:@//192.168.240.177:1599/DAPM"/>
+
+
+>>>>>>> 05596e9 (KJBank 암호화 관련 및 Sync 관련 수정)
 
 </Context>
\ No newline at end of file
diff --git a/elink-online-common b/elink-online-common
index aacc1a3..8ba0b6e 160000
--- a/elink-online-common
+++ b/elink-online-common
@@ -1 +1 @@
-Subproject commit aacc1a389e145453cf92c18e9d7ffef568cf89e7
+Subproject commit 8ba0b6ee9c9fe1f751be5ee5e727b73faccb80ee
diff --git a/elink-online-core b/elink-online-core
index 0f148e9..668aca0 160000
--- a/elink-online-core
+++ b/elink-online-core
@@ -1 +1 @@
-Subproject commit 0f148e997ec808e01a013baa8ca7b0053a69fe22
+Subproject commit 668aca0ff96e021096ba3add447e36a3c05b4535
diff --git a/elink-online-core-jpa b/elink-online-core-jpa
index 2cd9c29..33cf6fb 160000
--- a/elink-online-core-jpa
+++ b/elink-online-core-jpa
@@ -1 +1 @@
-Subproject commit 2cd9c29d4df228c1ffd7ed6471c8245510b19213
+Subproject commit 33cf6fbd3d5914095d2ef57c72888560bbdb3ac3
diff --git a/elink-online-emsclient b/elink-online-emsclient
index f68423b..b5f62fd 160000
--- a/elink-online-emsclient
+++ b/elink-online-emsclient
@@ -1 +1 @@
-Subproject commit f68423b40ecb5076990739f09f87ec62f7fd17ae
+Subproject commit b5f62fda76bdbb1f50f2427abf3979edad87610f
diff --git a/elink-online-transformer b/elink-online-transformer
index c3e2de4..3e16b13 160000
--- a/elink-online-transformer
+++ b/elink-online-transformer
@@ -1 +1 @@
-Subproject commit c3e2de482be0fa692a5133cf77e0e3dc86357b6e
+Subproject commit 3e16b13d7265518ad140433273101a9d4a4f694d