diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar
index 3b409b9..59af7e7 100644
Binary files a/cap/applib/ctg.jar and b/cap/applib/ctg.jar differ
diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index c4055b3..e30c607 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -48,7 +48,7 @@
                         <Sentence>
                                 SELECT CORG_NO FROM CAPTXNJNL
                                 WHERE DSK_NAM=? AND ORD_DT=? AND TXN_MOD=? AND DSK_NAM_STS='0' AND TXN_STS='U' AND CORG_DSK_NO = '0'
-                                group by CORG_NO
+                                group by CORG_NO having length(trim(CORG_NO)) > 0
                         </Sentence>
                         <Fields>DSK_NAM|ORD_DT|TXN_MOD</Fields>
                 </DynSentence>
@@ -294,6 +294,7 @@
                         <Exec func="PUB:RollbackWork"/>
                         <Return/>
                 </ElseIf>
+                <Delete>RTR_FLAG</Delete>
                 <Set>CAPTXNJNL.CYC_CD=CNY</Set>
                 <Set>CAPTXNJNL.CITY=$CAPTXNJNL.BANK_CITY</Set>
                 <Set>CAPTXNJNL.BANK_NAM=$CAPTXNJNL.BANK_NAME</Set>
diff --git a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
index 9d5d330..532001c 100644
--- a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
+++ b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
@@ -10,21 +10,13 @@
                 select listagg(dsk) WITHIN GROUP(ORDER BY dsk) dsk from
                 (select  '['||DSK_NAM||','||CORG_DSK_NO||','||BAT_STS||','||CORG_NO||']' dsk from CAPBATINF
                 where BAT_STS &lt;&gt; '4' and  BAT_STS &lt;&gt; '2'  and 
-                TO_CHAR(TO_DATE(decode(SND_DT||SND_TM,'  ',null,SND_DT||SND_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
+                TO_CHAR(TO_DATE(decode(SND_DT||SND_TM,'  ',null,SND_DT||SND_TM), 'yyyymmddHH24MISS')+'%s'/24/60/60, 'yyyymmddHH24MISS')
+                between TO_CHAR(sysdate - %s/24/60/60,'yyyymmddHH24MISS') and TO_CHAR(sysdate,'yyyymmddHH24MISS'))
             </Sentence>
-            <Fields>MINUTE</Fields>
+            <Fields>TIME_OUT|TIME_BEFER|</Fields>
         </DynSentence>
         <FlowCtrl>
 
-            <!--获取TOKEN-->
-            <Exec func="PUB:PARAM_GRP_GET" error="IGNORE">
-                <Arg name="ParamNam" value="CAPPARAMTER"/>
-                <Arg name="KeyNam" value="DSK_TIMEOUT_CORG"/>
-                <Arg name="GrpNam" value="CLOUD_SHIELD"/>
-            </Exec>
-
-            <Set>MINUTE=$CLOUD_SHIELD.P_VALUES</Set>
-
             <!--查询支付地账户-->
             <Exec func="PUB:ReadRecord" error="IGNORE">
                 <Arg name="SqlCmd" value="QryTimeout"/>
diff --git a/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML
index 6edeee7..9eefdef 100644
--- a/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML
+++ b/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML
@@ -9,20 +9,12 @@
             <Sentence>
                 select listagg(DSK) WITHIN GROUP(ORDER BY DSK) DSK from
                 (select  '['||DSK_NO||','||DSK_STS||']' DSK from CAPDSKINF where dsk_sts &lt;&gt; '4' and
-                TO_CHAR(TO_DATE(decode(RCV_DT||RCV_TM,'  ',null,RCV_DT||RCV_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
+                TO_CHAR(TO_DATE(decode(RCV_DT||RCV_TM,'  ',null,RCV_DT||RCV_TM), 'yyyymmddHH24MISS')+'%s'/24/60/60, 'yyyymmddHH24MISS')
+                between TO_CHAR(sysdate - %s/24/60/60,'yyyymmddHH24MISS') and TO_CHAR(sysdate,'yyyymmddHH24MISS'))
             </Sentence>
-            <Fields>MINUTE</Fields>
+            <Fields>TIME_OUT|TIME_BEFER|</Fields>
         </DynSentence>
         <FlowCtrl>
-
-            <!--获取TOKEN-->
-            <Exec func="PUB:PARAM_GRP_GET" error="IGNORE">
-                <Arg name="ParamNam" value="CAPPARAMTER"/>
-                <Arg name="KeyNam" value="DSK_TIMEOUT"/>
-                <Arg name="GrpNam" value="CLOUD_SHIELD"/>
-            </Exec>
-            <Set>MINUTE=$CLOUD_SHIELD.P_VALUES</Set>
-
             <!--查询支付地账户-->
             <Exec func="PUB:ReadRecord" error="IGNORE">
                 <Arg name="SqlCmd" value="QryTimeout"/>
diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
index 337a204..8faf15a 100644
--- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
+++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
@@ -6,7 +6,8 @@
         </Attributes>
         <DynSentence name="QryBatLst">
             <Sentence>
-                select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B
+                select dsk_nam from CAPDSKINF where DSK_NAM in
+               (select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B
                 where A.dsk_nam in (select dsk_nam from
                 (select dsk_nam,sum(unfinished_num) unfinished_num,sum(finish_num) finish_num
                 from (select dsk_nam,(case when BAT_STS not in ('4','2') then 1 else 0 end)
@@ -16,7 +17,8 @@
                 where c.unfinished_num = 0 and c.finish_num &gt; 0)
                 AND A.Customer_Id = B.Customer_Id
                 order by rank )
-                where ROWNUM &lt;= '5'
+                where ROWNUM &lt;= '1')
+                FOR UPDATE skip locked
             </Sentence>
             <Fields>DT_BEFER|</Fields>
         </DynSentence>
@@ -70,7 +72,7 @@
         <Function name="_before">
             <Process>
                 <!-- 应用加锁,防止并发 -->
-                <Set>LockKey=BAT_GET_DISK_RESULT</Set>
+                <!--Set>LockKey=BAT_GET_DISK_RESULT</Set>
                 <Exec func="PUB:Lock">
                     <Arg name="RecKey" value="$LockKey" error="IGNORE"/>
                     <Arg name="TimOut" value="1800"/>
@@ -81,17 +83,17 @@
                     <Set>Rsp_Msg=加锁失败</Set>
                     <Exit/>
                 </If>
-                <Set>IS_LOCKED=TRUE</Set>
+                <Set>IS_LOCKED=TRUE</Set-->
             </Process>
         </Function>
         <Function name="_after">
             <Process>
-                <If condition="IS_EQUAL_STRING($IS_LOCKED,TRUE)">
+                <!--If condition="IS_EQUAL_STRING($IS_LOCKED,TRUE)"-->
                     <!--解锁-->
-                    <Exec func="PUB:UnLock">
+                    <!--Exec func="PUB:UnLock">
                         <Arg name="RecKey" value="$LockKey"/>
                     </Exec>
-                </If>
+                </If-->
             </Process>
         </Function>
 
diff --git a/cap/etc/scheduler/TIMCON_PUB.XML b/cap/etc/scheduler/TIMCON_PUB.XML
index 85f64d4..c7d20b9 100644
--- a/cap/etc/scheduler/TIMCON_PUB.XML
+++ b/cap/etc/scheduler/TIMCON_PUB.XML
@@ -21,20 +21,20 @@
         <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
     </CycleItem>
     <!--心跳招行-->
-    <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='HEARTBEAT_CMB' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="120"  sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
+    <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='HEARTBEAT_CMB' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="3600"  sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
          <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
     </CycleItem>
  <!--心跳工行-->   
-    <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='HEARTBEAT_ICBC' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="120"  sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
+    <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='HEARTBEAT_ICBC' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="3600"  sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
          <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
     </CycleItem>
     <!--接入批次长时间未处理完成查询-->
-    <CycleItem istxn='0'  objsvr="OFRTCAP2" txncod='BAT_DSK_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="600" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'> 
-         <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data> 
+    <CycleItem istxn='0'  objsvr="OFRTCAP2" txncod='BAT_DSK_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="30" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'> 
+            <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA><TIME_OUT>3600</TIME_OUT><TIME_BEFER>30</TIME_BEFER></ROOT></Data> 
     </CycleItem> 
      <!--接出批次长时间未处理完成查询-->   
-     <CycleItem istxn='0'  objsvr="OFRTCAP2" txncod='BAT_DSK_CORG_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="300" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'> 
-         <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
+     <CycleItem istxn='0'  objsvr="OFRTCAP2" txncod='BAT_DSK_CORG_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="30" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'> 
+             <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA><TIME_OUT>1800</TIME_OUT><TIME_BEFER>30</TIME_BEFER></ROOT></Data>
      </CycleItem>
 
     <CycleItem istxn='0'  objsvr="OFRTCAP1" txncod='BAT_SEND_TIMER' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="65" sndflag ='0'  tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
diff --git a/cap/sql/init_cap.sql b/cap/sql/init_cap.sql
index 086672b..e83167c 100644
--- a/cap/sql/init_cap.sql
+++ b/cap/sql/init_cap.sql
@@ -101,10 +101,6 @@ values ('FIL_ZIP_PWD', '1234567', '文件加压解压密码', '0', ' ', ' ');
 insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
 values ('FIL_TOKEN', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZXN0IiwiaWF0IjoxNjE0MzI5NzU2LCJleHAiOjE2MTY5MjE3NTZ9.oH9Vvy-9HMF_5Ud11Wh47lP1F3s8ZudVLpgSzMomUmnhf-l-Hch4RZUQZzHBXQUBB4A2vWhFj9KfIB_K5Eb3rQ', '文件上传/下载TOKEN', '0', '20210226170159', ' ');
 insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
-values ('DSK_TIMEOUT', '60', '接入批次长时间未处理，以分为单位', '0', ' ', ' ');
-insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
-values ('DSK_TIMEOUT_CORG', '60', '接出批次长时间未处理，以分为单位', '0', ' ', ' ');
-insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
 values ('FIL_TOKEN_NAME', 'murong', '用户名', '0', ' ', ' ');
 insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
 values ('FIL_TOKEN_PWD', '173f6bcd4621d3736ade75332627b1y7', '密码', '0', ' ', ' ');