diff --git a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java index 2567aab..8b212de 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/DataImport/DataImport.java @@ -624,12 +624,12 @@ public class DataImport try { - saveTelsalePolicyDataToOracle( oracleConnection, policyList ); - //saveTelsalePolicyDataToInformix( informixConnection, policyList ); + //saveTelsalePolicyDataToOracle( oracleConnection, policyList ); + saveTelsalePolicyDataToInformix( informixConnection, policyList ); } - catch ( TelsalePolicyDataSaveToOracleException error ) + catch ( Exception error ) { - //写入oracle错误,回滚两个数据库,再抛出异常 + //出现任何错误,回滚两个数据库,再抛出异常 oracleConnection.rollback(); informixConnection.rollback(); @@ -643,14 +643,14 @@ public class DataImport // // throw new TelsalePolicyDataSaveToDatabaseException( error.getMessage() ); // } - catch (SQLException error ) - { - //任何其他sql错误,回滚两个数据库,再抛出异常 - oracleConnection.rollback(); - informixConnection.rollback(); - - throw error; - } +// catch (SQLException error ) +// { +// //任何其他sql错误,回滚两个数据库,再抛出异常 +// oracleConnection.rollback(); +// informixConnection.rollback(); +// +// throw error; +// } finally { //无论如何要关闭连接 diff --git a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java index d1b0488..5467c0a 100644 --- a/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java +++ b/代码/jsp/telsale_import/src/com/cpic/telsale/uploadData/uploadDataProcessor.java @@ -39,8 +39,9 @@ public class uploadDataProcessor extends HttpServlet oracleUserName = (String) config.getServletContext().getInitParameter( "oracleUserName" ); oraclePassword = (String) config.getServletContext().getInitParameter( "oraclePassword" ); - //informix - informixURL = (String) config.getServletContext().getInitParameter( "informixURL" ); + //informix dxbd_test + //informixURL = (String) config.getServletContext().getInitParameter( "informixURL" ); + informixURL = (String) config.getServletContext().getInitParameter( "dxbd_test" ); telsalePolicyOperatorListTableName = (String) config.getServletContext() .getInitParameter( "telsalePolicyOperatorListTableName" ); } diff --git a/代码/jsp/telsale_import/web/WEB-INF/web.xml b/代码/jsp/telsale_import/web/WEB-INF/web.xml index f717196..f08013c 100644 --- a/代码/jsp/telsale_import/web/WEB-INF/web.xml +++ b/代码/jsp/telsale_import/web/WEB-INF/web.xml @@ -35,6 +35,10 @@ informixURL jdbc:informix-sqli://10.187.11.163:9096/ywgl_xm:INFORMIXSERVER=pxmcx2;newcodeset=GBK,8859-1,819;user=ccx99;password=ct0IT17! + + dxbd_test + jdbc:informix-sqli://10.39.0.92:9096/ywgl_xm:INFORMIXSERVER=pxmcx2;newcodeset=GBK,8859-1,819;user=ccx99;password=ct0IT17! + ora_telsale_url jdbc:oracle:thin:@10.39.0.85:1521:dev01;user=telsale;password=Cpic%231234;