发布v2.6.8版本

This commit is contained in:
雨中磐石
2025-03-31 20:54:32 +08:00
parent 0701e2a8b4
commit d41bd27082
122 changed files with 9827 additions and 9132 deletions

View File

@@ -56,18 +56,24 @@ class beifenClassAction extends runtAction
/**
* 备份数据库
* php task.php beifen,create
* php task.php beifen,create -table=menu
*/
public function createAction()
{
if(PHP_SAPI != 'cli') return 'plase cli run';
$alltabls = $this->db->getalltable();
if(PHP_SAPI != 'cli') return 'plase cli run:php task.php beifen,create';
$table = $this->getparams('table');
ob_end_clean();
$path = ''.ROOT_PATH.'/'.DB_BASE.'_'.date('YmdHis').'.sql';
$path = ''.ROOT_PATH.'/'.DB_BASE.''.$table.'_'.date('YmdHis').'.sql';
$file = fopen($path, 'ab+');
$nobeifne = array(''.PREFIX.'log',''.PREFIX.'logintoken',''.PREFIX.'kqanay',''.PREFIX.'email_cont',''.PREFIX.'dailyfx',''.PREFIX.'reads',''.PREFIX.'todo',''.PREFIX.'city'); //不备份的表;
if($table){
$alltabls[] = ''.PREFIX.''.$table.'';
}else{
$alltabls = $this->db->getalltable();
}
foreach($alltabls as $tabs){
$sqla = $this->db->getall('show create table `'.$tabs.'`');
$createsql = $sqla[0]['Create Table'];

View File

@@ -82,7 +82,9 @@ class sysClassAction extends runtAction
if(in_array(''.PREFIX.'dailyfx', $alltabls))
m('dailyfx')->delete("`month`<'$month3'"); //日志分析
//更多清理自己添加
m('todo')->delete("`optdt`<'$date2 23:59:59'"); //6个月通知提醒
m('flow_todos')->delete("`adddt`<'$date2 23:59:59'"); //6个月单据提醒
return 'success';
}

View File

@@ -6,13 +6,14 @@
class tonghuaClassAction extends runtAction
{
public function sendcpush($arr)
public function sendcpush($arr, $isnei=false)
{
$arr['msgtype'] = 'calltonghua';
$arr['type'] = 'calltonghua';
$reimobj = m('reim');
$reimobj->pushserver('sendapp', $arr);
$reimobj->pushserver('send', $arr);
if($isnei)c('JPush')->sendJpush($arr);
}
/**
@@ -37,7 +38,19 @@ class tonghuaClassAction extends runtAction
$this->rock->adminid = $uid;
$this->rock->adminname = $urs['name'];
//每3秒呼叫一次
if($cishu==1){
$typea= array('语音','视频');
$cont = $this->jm->base64encode('['.$typea[$data['type']].'通话]');
$pushcont = $this->jm->base64encode('邀请与您'.$typea[$data['type']].'通话...');
m('reim')->sendinfor('user', $uid, $data['toid'], array(
'optdt' => $thrs['adddt'],
'cont' => $cont,
'pushcont' => $pushcont,
'msgid' => $channel
));
}
//每2秒呼叫一次
$this->sendcpush(array(
'adminid' => $uid,
'adminname' => $urs['name'],
@@ -50,17 +63,6 @@ class tonghuaClassAction extends runtAction
'receid' => $data['toid']
));
if($cishu==1){
$typea= array('语音','视频');
$cont = $this->jm->base64encode('['.$typea[$data['type']].'通话]');
$pushcont = $this->jm->base64encode('邀请与您'.$typea[$data['type']].'通话...');
m('reim')->sendinfor('user', $uid, $data['toid'], array(
'optdt' => $thrs['adddt'],
'cont' => $cont,
'pushcont' => $pushcont,
'msgid' => $channel,
));
}
c('rockqueue')->push('tonghua,call', array('key' => $key,'cishu'=>$cishu+1),time()+2);
return 'success';
@@ -78,9 +80,10 @@ class tonghuaClassAction extends runtAction
$this->sendcpush(array(
'adminid' => $data['uid'],
'calltype' => 'cancel',
'calltype' => 'cancel',
'th_channel'=> $channel,
'receid' => $data['toid']
));
), true);
return 'success';
}
@@ -103,6 +106,7 @@ class tonghuaClassAction extends runtAction
$this->sendcpush(array(
'adminid' => $data['toid'],
'calltype' => $tayar[$state],
'th_channel'=> $channel,
'receid' => $data['uid'].','.$data['toid']
));
@@ -122,7 +126,8 @@ class tonghuaClassAction extends runtAction
$channel = $this->getparams('channel');
$this->sendcpush(array(
'adminid' => $uid,
'calltype' => 'jiesu',
'calltype' => 'jiesu',
'th_channel'=> $channel,
'receid' => $toid
));
return c('xinhuapi')->getdata('tonghua','jiesu', array('uid'=>$uid,'nowtime'=>$nowtime,'channel'=>$channel));