2.1.0
This commit is contained in:
@@ -14,15 +14,28 @@
|
||||
if (!dzz_process::islocked($processname, 60*15)) {
|
||||
$locked=false;
|
||||
}
|
||||
|
||||
if ($locked) {
|
||||
exit(json_encode( array('error'=>'进程已被锁定请稍后再试')));
|
||||
}
|
||||
$force = isset($_GET['force']) ? intval($_GET['force']):0;
|
||||
$data = C::t('pichome_vapp')->fetch($appid);
|
||||
|
||||
if(!$data) exit(json_encode(array('error'=>'no data')));
|
||||
if(!$data){
|
||||
dzz_process::unlock($processname);
|
||||
runlog('exporterror',$appid.'nodata');
|
||||
exit(json_encode(array('error'=>'no data')));
|
||||
}
|
||||
if($data['state'] == 3) {
|
||||
dzz_process::unlock($processname);
|
||||
dfsockopen(getglobal('localurl') . 'misc.php?mod=exportfilecheck&appid=' . $appid, 0, '', '', false, '', 1);
|
||||
}
|
||||
elseif($data['state'] != 2 || $data['isdelete'] > 0) {
|
||||
dzz_process::unlock($processname);
|
||||
runlog('exporterror',$appid.'is deleted or state is not allow');
|
||||
exit(json_encode(array('error'=>'is deleted or state is not allow')));
|
||||
}
|
||||
|
||||
if($data['state'] != 2 && $data['isdelete'] != 0) exit(json_encode(array('error'=>'is deleted or state is not allow')));
|
||||
if($data['type'] == 0){
|
||||
include_once DZZ_ROOT.'dzz'.BS.'eagle'.BS.'class'.BS.'class_eagleexport.php';
|
||||
//include_once dzz_libfile('eagleexport');
|
||||
@@ -30,10 +43,13 @@
|
||||
try{
|
||||
$return = $eagleexport->execExport($force);
|
||||
}catch (Exception $e){
|
||||
C::t('pichome_vapp')->update($appid,['state'=>0]);
|
||||
runlog('eagleexporterror',$appid.$e->getMessage());
|
||||
dzz_process::unlock($processname);
|
||||
}
|
||||
|
||||
}elseif($data['type'] == 1){
|
||||
|
||||
include_once DZZ_ROOT.'dzz'.BS.'local'.BS.'class'.BS.'class_localexport.php';
|
||||
//include_once dzz_libfile('localexport');
|
||||
$localexport = new localexport($data);
|
||||
@@ -41,6 +57,8 @@
|
||||
try{
|
||||
$return = $localexport->execExport($force);
|
||||
}catch (Exception $e){
|
||||
C::t('pichome_vapp')->update($appid,['state'=>0]);
|
||||
runlog('localexporterror',$appid.$e->getMessage());
|
||||
dzz_process::unlock($processname);
|
||||
}
|
||||
}elseif ($data['type'] == 2){
|
||||
@@ -49,6 +67,8 @@
|
||||
try{
|
||||
$return = $billfishxport->execExport($force);
|
||||
}catch (Exception $e){
|
||||
C::t('pichome_vapp')->update($appid,['state'=>0]);
|
||||
runlog('billfishexporterror',$appid.$e->getMessage());
|
||||
dzz_process::unlock($processname);
|
||||
}
|
||||
}
|
||||
@@ -60,5 +80,5 @@
|
||||
}elseif($data['state'] == 3){
|
||||
dfsockopen(getglobal('localurl') . 'misc.php?mod=exportfilecheck&appid=' . $appid, 0, '', '', false, '', 1);
|
||||
}
|
||||
exit('success');
|
||||
// exit('success');
|
||||
|
||||
Reference in New Issue
Block a user