daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.5.5版本

Browse Source
This commit is contained in:
雨中磐石
2023-04-05 13:00:20 +08:00
parent bc69541c7b
commit 33ce4c6298
102 changed files with 570 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webmain/task/api/indexreimAction.php
View File

@@ -175,6 +175,7 @@ class indexreimClassAction extends apiAction
$arr['outunum'] = $this->option->getval('outunum'.$this->adminid.'');
$arr['outgroupopen'] = $this->option->getval('outgroupopen'.$this->adminid.'');
$arr['tonghuabo'] = getconfig('video_bool') ? '1' : '2';//是否开启音视频
$arr['lxrshow'] = ($this->option->getval('appsy_lxrshow')!='否') ? 1 : 2;
$this->showreturn($arr);
}

1
webmain/task/api/loginAction.php
View File

@@ -260,6 +260,7 @@ class loginClassAction extends apiAction
$mobile = $this->get('mobile');
if(!$openid || !$mobile)return returnerror('err');
$mobile = $this->jm->base64decode($mobile);
if(!c('check')->iscnmobile($mobile))return returnerror('err2');
$where = "`mobile`='$mobile'";
if(m('admin')->rows($where)==0 && m('customer')->rows($where)==0 )return retuenerror('此手机号没在我们系统登记过');
$na = getconfig('titleout');

2
webmain/task/api/uploadAction.php
View File

@@ -540,7 +540,7 @@ class uploadClassAction extends apiAction
$where = '`id` in(select `fileid` from `[Q]word` where `type`=0 '.$str.' )';
}
if($key){
$key = $this->jm->base64decode($key);
$key = $this->rock->xssrepstr($this->jm->base64decode($key));
$where.=" and `filename` like '%".$key."%'";
}
if($uptp && $uptp!='*'){

2
webmain/task/mode/tpl_mode_p.html
View File

@@ -176,7 +176,7 @@ if($stype!=''){
<img align="absmiddle" height="16" width="16" src="images/xiangyou1.png"> <a temp="clo" href="javascript:;" onclick="$('#recordss').remove();">×</a>
<?php }?>
</div>
<div id="showrecord0" style="display:none">
<div id="showrecord0" style="display:<?php if(getconfig('xiangrecord')!='1')echo 'none';?>">
<table border="0" class="tabled2" style="border-collapse:collapse;" width="100%" cellspacing="0" cellpadding="0">
<tr bgcolor="#E1F4F0">
<td>序号</td>

2
webmain/task/mode/tpl_mode_x.html
View File

@@ -324,7 +324,7 @@ if($da['arr']['isplview']=='1'){
$logcount= count($logarr);
?>
<div onclick="c.changeshow(0)" class="r-subtitle">&nbsp;&nbsp;处理记录(<?=$logcount?>) <img align="absmiddle" height="16" width="16" src="images/xiangyou1.png"> </div>
<div id="showrecord0" class="pinglun r-border-t" style="background:white;display:none">
<div id="showrecord0" class="pinglun r-border-t" style="background:white;display:<?php if(getconfig('xiangrecord')!='1')echo 'none';?>">
<table width="100%">
<?php
foreach($logarr as $k=>$rs){

37
webmain/task/runt/kaoqinAction.php
View File

@@ -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'].')';
}
//钉钉

2
webmain/task/runt/minute5Action.php
View File

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

2
webmain/task/runt/runtAction.php
View File

@@ -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,