diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index 72ea8c453..0c4dd43de 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -1,15 +1,15 @@
-
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/a3web.xml b/WebContent/WEB-INF/etc/a3web.xml
index fbb734d30..f20b5c9e5 100644
--- a/WebContent/WEB-INF/etc/a3web.xml
+++ b/WebContent/WEB-INF/etc/a3web.xml
@@ -84,8 +84,8 @@
BusinessDueBill
- https://ret.ap-leasing.com/report
- https://ret.ap-leasing.com/report
+ https://60.205.189.63/report
+ https://60.205.189.63/report
true
diff --git a/WebContent/WEB-INF/etc/simplelog.properties b/WebContent/WEB-INF/etc/simplelog.properties
index 952260e40..f12cb8ab1 100644
--- a/WebContent/WEB-INF/etc/simplelog.properties
+++ b/WebContent/WEB-INF/etc/simplelog.properties
@@ -7,13 +7,13 @@ com.amarsoft.are.log.SimpleLog.handlers=com.amarsoft.are.log.impl.ConsoleHandler
com.amarsoft.are.log.impl.simple.WarnFileHandler.level = error;
-com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = /data/files/apzl_leasing/tmp/log/a3web_warn_%g.log
+com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = D:/tmp/log/a3web_warn_%g.log
com.amarsoft.are.log.impl.simple.WarnFileHandler.limit = 1024000
com.amarsoft.are.log.impl.FileHandler.level = info#com.amarsoft.are.log.impl.FileHandler.pattern = {$ARE.APP_HOME}/log/a3web_%D_%g.log
-com.amarsoft.are.log.impl.FileHandler.pattern = /data/files/apzl_leasing/tmp/log/a3web_%D_%g.log
+com.amarsoft.are.log.impl.FileHandler.pattern = D:/tmp/log/a3web_%D_%g.log
com.amarsoft.are.log.impl.FileHandler.limit = 10240000
com.amarsoft.are.log.impl.FileHandler.count = 10
diff --git a/build.xml b/build.xml
index c0d4cd373..3b1585bb7 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,6 @@
-
diff --git a/config/bigdata.properties b/config/bigdata.properties
index 9497d810f..cca3cffe4 100644
--- a/config/bigdata.properties
+++ b/config/bigdata.properties
@@ -7,8 +7,26 @@ keyword4 =
keyword5 =fullcardNo
#pengyuan
-pengyuanUrl=http://www.pycredit.com:8443
+#shenzhen canshu
+#pengyuanUrl=http://www.pycredit.com:8001
+pengyuanUrl=http://test.pycredit.com:6001
pengyuanServer=/services/WebServiceSingleQuery?wsdl
-userId = apwsqueryn
-password = {MD5}fZ5p+Gnj7FWvmdrBRWy+oQ==
+
+userId = apwsqueryn01
+password = {MD5}i3rx5Ta+2VL5Dj5T866giQ==
methodType = queryReport
+
+
+#tianjin canshu
+t_pengyuanUrl=http://test.pycredit.com:6001
+t_pengyuanServer=/services/WebServiceSingleQuery?wsdl
+t_userId = apwsqueryn01
+t_password = {MD5}i3rx5Ta+2VL5Dj5T866giQ==
+t_methodType = queryReport
+
+
+
+
+
+
+
diff --git a/config/collect_config.properties b/config/collect_config.properties
index 96a704927..c08ea2cc7 100644
--- a/config/collect_config.properties
+++ b/config/collect_config.properties
@@ -1,24 +1,17 @@
#sheng chan huan jing url
-#com.tenwa.yangdm.collect.serverUrl=https://cps.gnete.com:8085/ProcessServlet
-#com.tenwa.yangdm.bank.serverUrl=https://cps.gnete.com:8191/gzdsf/ProcessServlet
+#com.tenwa.yangdm.collect.serverUrl=http://cps.gnete.com/ProcessServlet
+#com.tenwa.yangdm.bank.serverUrl=http://cps.gnete.com:8191/gzdsf/ProcessServlet
#ce shi huan jing url dai shou collect si yao su bank feiyasuo
-#com.tenwa.yangdm.collect.serverUrl=https://cps.gnete.com:8085/gzdsf/ProcessServlet
-com.tenwa.yangdm.collect.serverUrl=http://172.28.1.59:8085/gzdsf/ProcessServlet
-com.tenwa.yangdm.bank.serverUrl=http://172.28.1.59:8085/gzdsf/ProcessServlet
-
-
+com.tenwa.yangdm.collect.serverUrl=http://59.41.103.98:333/gzdsf/ProcessServlet
+com.tenwa.yangdm.bank.serverUrl=http://59.41.103.98:9110/gzdsf/ProcessServlet
#---------------------------------------------------------------------------------------------
#clearFile downUrl
-com.tenwa.yangdm.bank.clearRequestUrl=http://172.28.1.59:8085/gzdsf/GetSettFile.do
+com.tenwa.yangdm.bank.clearRequestUrl=http://59.41.103.98:9110/gzdsf/GetSettFile.do
#com.tenwa.yangdm.merchantId=000191400207649
#test shang hu dai ma
-#zheng shi
-com.tenwa.yangdm.merchantId=000191400209238
-com.tenwa.yangdm.collect.userName=00019140020923804
-com.tenwa.yangdm.collect.userPass=APleasing-88
-com.tenwa.yangdm.collect.businessCode=10702
+com.tenwa.yangdm.merchantId=001053110000001
#---------------------------------------------------------------------------------------------
#daishoupeizhi ( 'S' dai biao dai shou,batch.trxCode dai biao piliangdaishou,collect.trxCode dai biao shishidaishou,version banbenhao)
@@ -37,9 +30,9 @@ com.tenwa.yangdm.collect.level=5
#com.tenwa.yangdm.collect.businessCode=10702
#test (ce shi huan jing zheng shi tou chan hou zhu shi diao)
-#com.tenwa.yangdm.collect.userName=operator
-#com.tenwa.yangdm.collect.userPass=ora_123456
-#com.tenwa.yangdm.collect.businessCode=10600
+com.tenwa.yangdm.collect.userName=operator
+com.tenwa.yangdm.collect.userPass=ora_123456
+com.tenwa.yangdm.collect.businessCode=10600
#yin hang ka si yao su yan zheng
com.tenwa.yangdm.bank.trxCode=100039
@@ -48,6 +41,6 @@ com.tenwa.yangdm.bank.dataType=2
com.tenwa.yangdm.bank.level=5
#an quan zheng shu xiang guan (si yao he gong yao de cun fang wei zhi)
-com.tenwa.yangdm.publicKeyUrl=/soft/files/yinlian/SecutyKey/gnete_pds.cer
-com.tenwa.yangdm.privateKeyUrl=/soft/files/yinlian/SecutyKey/cps@00019140020923804.p12
-#com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\cps@00019140020764901.p12
+com.tenwa.yangdm.publicKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\gzdsf.cer
+com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\ORA@TEST1.p12
+#com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\cps@00019140020764901.p12
\ No newline at end of file
diff --git a/config/credit.properties b/config/credit.properties
index 91b371206..84f5ac693 100644
--- a/config/credit.properties
+++ b/config/credit.properties
@@ -1,11 +1,26 @@
#tong dun jie kou dizhi ceshi
-apiUrl=https://api.tongdun.cn:8083/bodyguard/apply/v4.2
+apiUrl=https://apitest.tongdun.cn/bodyguard/apply/v4.2
+#shenzhen canshu
#he zuo fang biao shi ceshi
PARTNER_CODE=apgj
#he zuo fang mi yao ceshi
-PARTNER_KEY=2a0842b540e74c48ab1921f1f5d09378
+PARTNER_KEY=3a7be6a6d73c48b18f083ddf8d399538
#he zuo fang ying yong ming che ceshi
-PARTNER_APP=apgj_web
\ No newline at end of file
+PARTNER_APP=apgj_web
+
+
+#tianjin canshu
+#tong dun jie kou dizhi ceshi
+T_apiUrl=https://apitest.tongdun.cn/bodyguard/apply/v4.2
+
+#he zuo fang biao shi ceshi
+T_PARTNER_CODE=apgj
+
+#he zuo fang mi yao ceshi
+T_PARTNER_KEY=3a7be6a6d73c48b18f083ddf8d399538
+
+#he zuo fang ying yong ming che ceshi
+T_PARTNER_APP=apgj_web
\ No newline at end of file
diff --git a/config/gps.properties b/config/gps.properties
index c91504f7f..e9244cc30 100644
--- a/config/gps.properties
+++ b/config/gps.properties
@@ -1,9 +1,6 @@
-TYuserAccount=apprd
-TYtoken=128
-TYsign=F14D4C3CD95053F55E1B551361A9E302
-TYsign2=f14d4c3cd95053f55e1b551361a9e302
-#tainyi URL xiugaiqian beifen
-#TYUrl=http://api.tianyigps.cn/dispatch_intf/apiController/order
-#TYQueryOrderToVin=http://api.tianyigps.cn/gps-intf/api2/getGpsInfosByCarVin
-TYUrl=http://172.28.1.59:8866/dispatch_intf/apiController/order
-TYQueryOrderToVin=http://172.28.1.59:8867/gps-intf/api2/getGpsInfosByCarVin
\ No newline at end of file
+TYuserAccount=tianyitest
+TYtoken=9999
+TYsign=3474A2D7CFEC5DECD54DE8A263F7A4A9
+TYsign2=3474a2d7cfec5decd54de8a263f7a4a9
+TYUrl=http://121.43.178.183:9989/dispatch_intf/apiController/order
+TYQueryOrderToVin=http://121.43.178.183:80/gps-intf/api2/getGpsInfosByCarVin
\ No newline at end of file
diff --git a/config/interfacePlatform.properties b/config/interfacePlatform.properties
index a90f40945..279757282 100644
--- a/config/interfacePlatform.properties
+++ b/config/interfacePlatform.properties
@@ -1,4 +1,4 @@
-url=https://ret.ap-leasing.com/platform/batch/kjflc/
+url=http://localhost:8080/platform/batch/kjflc/
FileToPush=pushToBatchDealAllTimer
AtTheEndOfContractPush=ContractFinishPushTimer
ContractLoanPush=loanPushTimer
diff --git a/config/license.properties b/config/license.properties
index a62cef1e2..3d3bc83c0 100644
--- a/config/license.properties
+++ b/config/license.properties
@@ -1,2 +1,10 @@
+#shenzhen
#ying ke hu yao qiu xian guan bi shen fen yan zheng bas64jiami
-key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=
\ No newline at end of file
+#key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=
+
+
+#tianjin
+#ying ke hu yao qiu xian guan bi shen fen yan zheng bas64jiami
+#t_key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=
+
+#
\ No newline at end of file
diff --git a/config/log4j.xml b/config/log4j.xml
index fb7636820..0d47c0200 100644
--- a/config/log4j.xml
+++ b/config/log4j.xml
@@ -9,7 +9,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
@@ -85,6 +85,7 @@
@@ -98,6 +99,7 @@
+
@@ -107,16 +109,19 @@
+
+
+
-->
diff --git a/config/quartz.properties b/config/quartz.properties
index 8cecddd40..b275217d0 100644
--- a/config/quartz.properties
+++ b/config/quartz.properties
@@ -1,7 +1,6 @@
-org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://rm-2zed0cp432cn85447.mysql.rds.aliyuncs.com:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false
+org.quartz.dataSource.zhulhDS.URL=jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false
org.quartz.dataSource.zhulhDS.user=338A48E135315FDBC2DF24EB080903D7
-#org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
-org.quartz.dataSource.zhulhDS.key=C1CD9E690DFC628EE4114CA3F56B433D
+org.quartz.dataSource.zhulhDS.key=431DC9744DEF477868F97C4842F87AB3
org.quartz.dataSource.zhulhDS.driver=com.mysql.jdbc.Driver
c3p0.minPoolSize=5
c3p0.maxPoolSize=400
@@ -23,31 +22,27 @@ org.quartz.scheduler.skipUpdateCheck=true
org.quartz.scheduler.instanceName=QuartzScheduler
org.quartz.scheduler.instanceId=AUTO
org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount=25
-org.quartz.threadPool.threadPriority=5
-org.quartz.jobStore.misfireThreshold=600000
+org.quartz.threadPool.threadCount=50
+org.quartz.threadPool.threadPriority=4
+org.quartz.jobStore.misfireThreshold=500
org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
org.quartz.jobStore.dataSource=zhulhDS
org.quartz.dataSource.zhulhDS.connectionProvider.class=com.tenwa.quartz.MyPoolingConnectionProvider
org.quartz.jobStore.tablePrefix=QRTZ_
-org.quartz.jobStore.isClustered=true
+org.quartz.jobStore.isClustered=false
org.quartz.jobStore.clusterCheckinInterval=15000
org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
org.quartz.dataSource.zhulhDS.maxConnections=50
-org.quartz.dataSource.zhulhDS.validationQuery=select 0 from dual
+
#control distributor(temporary)
distributor_role = 401
#libreOffice
-libreOffice_path=/opt/libreoffice5.4/program/
+libreOffice_path=//opt//libreoffice5.4//program//
#file_upload
-#fileType = jpg,png,gif,bmp,xlsx,rar,jpeg,rar,zip,pdf,word
-fileType = jpg,png,gif,bmp,xlsx,rar,jpeg,rar,zip,pdf,doc,docx,txt,xls,mp4,mov,m4v,avi,3gp,rm,rmvb,wmv,asf,mkv,vob,pptx,xlsm,vsdx
+fileType = jpg,png,gif,bmp,xlsx,rar,jpeg
fileNumLimit = 12
#unit(m)
-fileSizeLimit = 600
-fileSingleSizeLimit = 50
-autoUpload = true
-#webService bai ming dan
-webServiceaddress=0:0:0:0:0:0:0:1|127.0.0.1|114.242.173.194|47.93.227.86|39.96.128.27|61.149.204.98|218.26.54.168|1.202.246.171
-
+fileSizeLimit = 96
+fileSingleSizeLimit = 8
+autoUpload = true
\ No newline at end of file
diff --git a/config/telonline.properties b/config/telonline.properties
index 985f8d2c5..e2c8d1799 100644
--- a/config/telonline.properties
+++ b/config/telonline.properties
@@ -1,11 +1,25 @@
-#\u751F\u4EA7\u8BF7\u6C42\u5730\u5740
+#shenzhen canshu
+#\u6D4B\u8BD5\u8BF7\u6C42\u5730\u5740
com.tenwa.jianghd.url1=https
-com.tenwa.jianghd.url2=api.tongdun.cn:8083
-com.tenwa.jianghd.url3=/bodyguard/apply/v4.2
+com.tenwa.jianghd.url2=apitest.tongdun.cn
+com.tenwa.jianghd.url3=/bodyguard/apply/v4.3
com.tenwa.jianghd.partner_code=apgj
-com.tenwa.jianghd.partner_key=2a0842b540e74c48ab1921f1f5d09378
+com.tenwa.jianghd.partner_key=3a7be6a6d73c48b18f083ddf8d399538
com.tenwa.jianghd.app_name=apgj_web
com.tenwa.jianghd.biz_code=OnLine
com.tenwa.jianghd.encode=UTF-8
+
+#tianjin canshu
+#\u6D4B\u8BD5\u8BF7\u6C42\u5730\u5740
+com.tenwa.jianghd.t_url1=https
+com.tenwa.jianghd.t_url2=apitest.tongdun.cn
+com.tenwa.jianghd.t_url3=/bodyguard/apply/v4.3
+
+com.tenwa.jianghd.t_partner_code=apgj
+com.tenwa.jianghd.t_partner_key=3a7be6a6d73c48b18f083ddf8d399538
+com.tenwa.jianghd.t_app_name=apgj_web
+
+com.tenwa.jianghd.t_biz_code=OnLine
+com.tenwa.jianghd.t_encode=UTF-8
\ No newline at end of file
diff --git a/config/vouchers.properties b/config/vouchers.properties
index f93a51966..7476ebc86 100644
--- a/config/vouchers.properties
+++ b/config/vouchers.properties
@@ -117,16 +117,21 @@ contract_pk_org=06
#\u7528\u53CB\u8FDE\u63A5\u914D\u7F6E-\u6D4B\u8BD5:http://172.16.0.88:9990/service/XChangeServlet?account=8&groupcode=06
#\u7528\u53CB\u8FDE\u63A5\u914D\u7F6E-\u6B63\u5F0F:http://sk.baicgroup.com.cn:80/service/XChangeServlet?account=8&groupcode=06
#IP\u5730\u5740\u53CA\u7AEF\u53E3
-NC_URL=http://sk.baicgroup.com.cn/
-
+#NC_URL=http://sk.baicgroup.com.cn/
+NC_URL=http://172.16.0.88:9990/
+#NC_URL=http://test.baicgroup.com.cn/
#\u8D26\u5957
account=8
#\u96C6\u56E2\u7F16\u7801
groupcode=06
#\u4F20\u8F93xml\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
-LOCALHOST_URL=//data//files//apzl_leasing//tmp//XZW//
+#LOCALHOST_URL=//data//files//apzl_leasing//tmp//XZW//
+LOCALHOST_URL=E:\\voucherXml_NC\\
#\u56DE\u6267\u4FE1\u606F\u5B58\u653E\u8DEF\u5F84
-RECEIVE_URL=//data//files//apzl_leasing//tmp//WEN//
+#RECEIVE_URL=//data//files//apzl_leasing//tmp//WEN//
+RECEIVE_URL=E:\\VOUCHER_RECEIPT\\
#\u5F02\u5E38\u4FE1\u606F\u5B58\u653E\u8DEF\u5F84
-ERROR_URL=//data//files//apzl_leasing//tmp//NC_ERROR//
+#ERROR_URL=//data//files//apzl_leasing//tmp//NC_ERROR//
+ERROR_URL=E:\\NC_ERROR\\
+