diff --git a/wildfly_tml/config/META-INF/tml-config.xml b/wildfly_tml/config/META-INF/tml-config.xml
index 916a286..0855f32 100644
--- a/wildfly_tml/config/META-INF/tml-config.xml
+++ b/wildfly_tml/config/META-INF/tml-config.xml
@@ -5,16 +5,16 @@
         <yard name="KHHW" id="KHH063" place_code="TWKHH" descn_e="KHH063" descn_c="高雄碼頭" defaultSite="true">
             <datasources>
                 <datasource name="prod">
-                    <tnsName>whlt_khhw5</tnsName>
-                    <jndiValue>java:/OraWhltDS</jndiValue>
+                    <tnsName>whlt_khhw7</tnsName>
+                    <jndiValue>java:/OraWhltKHHW7DS</jndiValue>
                 </datasource>
                 <datasource name="uat">
-                    <tnsName>whlt_khhw6</tnsName>
-                    <jndiValue>java:/OraWhltDS</jndiValue>
+                    <tnsName>whlt_khhw58</tnsName>
+                    <jndiValue>java:/OraWhltKHHW58DS</jndiValue>
                 </datasource>
                 <datasource name="sat">
-                    <tnsName>whlt_khhw6</tnsName>
-                    <jndiValue>java:/OraWhltDS</jndiValue>
+                    <tnsName>whlt_khhw58</tnsName>
+                    <jndiValue>java:/OraWhltKHHW58DS</jndiValue>
                 </datasource>
             </datasources>
             <!--ott server url-->
@@ -23,17 +23,17 @@
         <yard name="TXGW" id="TXG034" place_code="TWTXG" descn_e="TXG034" descn_c="台中碼頭">
             <datasources>
                 <datasource name="prod">
-                    <tnsName>whlt_txgw5</tnsName>
-                    <jndiValue>java:/OraWhltDS</jndiValue>
+                    <tnsName>whlt_txgw7</tnsName>
+                    <jndiValue>java:/OraWhltTXGW7DS</jndiValue>
                 </datasource>
                 <datasource name="uat">
-                    <tnsName>whlt_txgw6</tnsName>
-                    <jndiValue>java:/OraWhltDS</jndiValue>
+                    <tnsName>whlt_txgw58</tnsName>
+                    <jndiValue>java:/OraWhltTXGW58DS</jndiValue>
                 </datasource>
                 <datasource name="sat">
-                    <tnsName>whlt_txgw6</tnsName>
-                    <jndiValue>java:/OraWhltDS</jndiValue>
-                </datasource>
+                    <tnsName>whlt_txgw58</tnsName>
+                    <jndiValue>java:/OraWhltTXGW58DS</jndiValue>
+        </datasource>
             </datasources>
             <!--ott server url-->
             <ott>/collab/ott/oneTimeTicket.jsp</ott>
diff --git a/wildfly_tml_khhw/config/standalone.xml b/wildfly_tml_khhw/config/standalone.xml
index ba838d9..5d37e74 100644
--- a/wildfly_tml_khhw/config/standalone.xml
+++ b/wildfly_tml_khhw/config/standalone.xml
@@ -140,21 +140,14 @@
         <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
         <subsystem xmlns="urn:jboss:domain:datasources:5.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
-                    <driver>h2</driver>
-                    <security>
-                        <user-name>sa</user-name>
-                        <password>sa</password>
-                    </security>
-                </datasource>
-                <datasource jta="true" jndi-name="java:/OraWhltKHHW5DS" pool-name="OraWhltKHHW5DS" enabled="true" use-ccm="true">
-                    <connection-url>jdbc:oracle:thin:@khhw6.wanhai.com:1521:whlt</connection-url>
+                <!-- KHHW PROD DB -->
+                <datasource jta="true" jndi-name="java:/OraWhltKHHW7DS" pool-name="OraWhltKHHW7DS" enabled="true" use-ccm="true">
+                    <connection-url>jdbc:oracle:thin:@khhw7.wanhai.com:1521:whlt</connection-url>
                     <driver-class>oracle.jdbc.OracleDriver</driver-class>
                     <driver>oracle</driver>
                     <security>
                         <user-name>KHHTMLWEB01</user-name>
-                        <password>webkhhtml180713</password>
+                        <password>K5TGX8A2</password>
                     </security>
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/>
@@ -163,13 +156,14 @@
                         <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
                     </validation>
                 </datasource>
-                <datasource jta="true" jndi-name="java:/OraWhltKHHW6DS" pool-name="OraWhltKHHW6DS" enabled="true" use-ccm="true">
-                    <connection-url>jdbc:oracle:thin:@khhw6.wanhai.com:1521:whlt</connection-url>
+                <!-- KHHW UAT DB -->
+                <datasource jta="true" jndi-name="java:/OraWhltKHHW58DS" pool-name="OraWhltKHHW58DS" enabled="true" use-ccm="true">
+                    <connection-url>jdbc:oracle:thin:@khhw58.wanhai.com:1521:whlt</connection-url>
                     <driver-class>oracle.jdbc.OracleDriver</driver-class>
                     <driver>oracle</driver>
                     <security>
                         <user-name>KHHTMLWEB01</user-name>
-                        <password>webkhhtml180713</password>
+                        <password>WEBKHHTML180713</password>
                     </security>
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/>
diff --git a/wildfly_tml_txgw/config/standalone.xml b/wildfly_tml_txgw/config/standalone.xml
index ea9ad0e..2a707aa 100644
--- a/wildfly_tml_txgw/config/standalone.xml
+++ b/wildfly_tml_txgw/config/standalone.xml
@@ -140,32 +140,8 @@
         <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
         <subsystem xmlns="urn:jboss:domain:datasources:5.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
-                    <driver>h2</driver>
-                    <security>
-                        <user-name>sa</user-name>
-                        <password>sa</password>
-                    </security>
-                </datasource>
-                <!-- TXGW UAT DB -->
-                <datasource jta="true" jndi-name="java:/OraWhltTXGW6DS" pool-name="OraWhltTXGW6DS" enabled="true" use-ccm="true">
-                    <connection-url>jdbc:oracle:thin:@txgw6.wanhai.com:1521:whlt</connection-url>
-                    <driver-class>oracle.jdbc.OracleDriver</driver-class>
-                    <driver>oracle</driver>
-                    <security>
-                        <user-name>TXGTMLWEB01</user-name>
-                        <password>TXGTMLWEB180829</password>
-                    </security>
-                    <validation>
-                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/>
-                        <background-validation>true</background-validation>
-                        <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"/>
-                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
-                    </validation>
-                </datasource>
                 <!-- TXGW PROD DB -->
-                <datasource jta="true" jndi-name="java:/OraWhltTXGW5DS" pool-name="OraWhltTXGW5DS" enabled="true" use-ccm="true">
+                <datasource jta="true" jndi-name="java:/OraWhltTXGW7DS" pool-name="OraWhltTXGW7DS" enabled="true" use-ccm="true">
                     <connection-url>jdbc:oracle:thin:@txgw5.wanhai.com:1521:whlt</connection-url>
                     <driver-class>oracle.jdbc.OracleDriver</driver-class>
                     <driver>oracle</driver>
@@ -179,15 +155,15 @@
                         <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"/>
                         <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
                     </validation>
-                </datasource>   
-                <!-- TXGW CATOS PROD DB -->
-                <datasource jta="true" jndi-name="java:/OraWhltTXGW7DS" pool-name="OraWhltTXGW7DS" enabled="true" use-ccm="true">
-                    <connection-url>jdbc:oracle:thin:@txgw7.wanhai.com:1521:whlt</connection-url>
+                </datasource>            
+                <!-- TXGW UAT DB -->
+                <datasource jta="true" jndi-name="java:/OraWhltTXGW58DS" pool-name="OraWhltTXGW58DS" enabled="true" use-ccm="true">
+                    <connection-url>jdbc:oracle:thin:@txgw6.wanhai.com:1521:whlt</connection-url>
                     <driver-class>oracle.jdbc.OracleDriver</driver-class>
                     <driver>oracle</driver>
                     <security>
                         <user-name>TXGTMLWEB01</user-name>
-                        <password>TH65WX98</password>
+                        <password>WEBTXGTML180713</password>
                     </security>
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/>
@@ -195,7 +171,7 @@
                         <stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleStaleConnectionChecker"/>
                         <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/>
                     </validation>
-                </datasource>              
+                </datasource>               
                 <drivers>
                     <!-- default add oracle/mysql jdbc drivers -->
                     <driver name="mysql" module="com.mysql.jdbc"/>