发布v2.5.5版本

webmain/task/runt/kaoqinAction.php

@@ -64,19 +64,32 @@ class kaoqinClassAction extends runtAction
 		$dt1	= '';
 		$dt2	= '';
 		$msg 	= 'success';
-		if($reimbo->installwx(1)){
-			$barr 	= m('weixinqy:daka')->getrecord($uids, $dt1, $dt2, 1);
-			//加入异步
-			if($uids=='' && $barr['errcode']==0 && $barr['maxpage']>1){
-				for($i=1;$i<=$barr['maxpage'];$i++){
-					if($i>1)$reimbo->asynurl('asynrun','wxdkjl', array(
-						'dt1' 		=> $dt1,
-						'dt2' 		=> $dt2,
-						'page' 		=> $i
-					));
-				}
+		
+		$daka 	= $this->option->getval('qywxplat_daka');
+		if($daka=='1'){
+			$barr = c('rockqywx')->getcheckindata($uids, $dt1, $dt2, 1);
+			if(!$barr['success']){
+				$msg .= ','.$barr['msg'];
+			}else{
+				$data = $barr['data'];
+				$msg .= ',从代建中应用获取打卡(共'.$data['zongts'].'条,新增'.$data['okload'].'条)';
+				if($data['maxpage']>1)$msg.=',并发送异步请求1条';
+			}
+		}else{
+			if($reimbo->installwx(1)){
+				$barr 	= m('weixinqy:daka')->getrecord($uids, $dt1, $dt2, 1);
+				//加入异步
+				if($uids=='' && $barr['errcode']==0 && $barr['maxpage']>1){
+					for($i=1;$i<=$barr['maxpage'];$i++){
+						if($i>1)$reimbo->asynurl('asynrun','wxdkjl', array(
+							'dt1' 		=> $dt1,
+							'dt2' 		=> $dt2,
+							'page' 		=> $i
+						));
+					}
+				}
+				if($barr['errcode']!=0)$msg .= ',企业微信('.$barr['msg'].')';
 			}
-			if($barr['errcode']!=0)$msg .= ',企业微信('.$barr['msg'].')';
 		}
 		
 		//钉钉

webmain/task/runt/minute5Action.php

@@ -1,7 +1,7 @@
 <?php 
 class minute5ClassAction extends runtAction
 {
-	
+	public $startdt,$enddt,$enddtss;
 	public function runAction()
 	{
 		$time 	= time();

webmain/task/runt/runtAction.php

@@ -63,7 +63,7 @@ class runtAction extends ActionNot
 		if($this->runid > 0){
 			$state	= 2;
 			$cont  	= ob_get_contents();	
-			if($cont=='success')$state=1;
+			if(contain($cont,'success'))$state=1;
 			m('task')->update(array(
 				'lastdt'	=> $this->rock->now,
 				'lastcont' 	=> $cont,