点击选择CMS
';for(var x in data.data){var list=data.data[x];html+='- ';for(var y in list){html+='
- '+list[y]+' '} html+='
采集字段：在“任务»采集器设置»获取内容”中添加
查询：在表的查询操作中可添加查询内容
自增主键：在当前表之前有新增表时会自动显示
',yes:'确定',width:400,textAlign:'left'})});$('#db_table_bind_list').on('change','.db-table-bind-op',function(){var prtObj=$(this).parents('[id^="db_table_t_"]').eq(0);prtObj.find('.db-table-bind-where').hide();prtObj.find('.db-table-bind-query').hide();prtObj.find('.db-table-bind-data').hide();prtObj.find('.db-table-bind-data-seq').hide();var val=$(this).val();var showData=!1;if(!val){showData=!0;prtObj.find('.db-table-bind-data').show()}else if(val=='update'){showData=!0;prtObj.find('.db-table-bind-where').show();prtObj.find('.db-table-bind-data').show()}else if(val=='query'){prtObj.find('.db-table-bind-where').show();prtObj.find('.db-table-bind-query').show()} if(showData){var seqObj=prtObj.find('.db-table-bind-data-seq');if(seqObj.length>0){seqObj.show()}}});$('#db_table_bind_list').on('click','.db-table-bind-signs .btn-db-table-bind-signs',function(){var boxObj=$(this).parents('.db-table-bind-signs').eq(0);if(!boxObj||boxObj.length<=0){return} -var dropdownMenu=boxObj.find('.dropdown-menu');if(dropdownMenu.length>0){dropdownMenu.html('');var key=$(this).parents('[id^="db_table_t_"]').eq(0).attr('data-key');ajaxOpen({type:'POST',dataType:'html',url:ulink('release/dbTableBindSings?table_key=_key_',{'_key_':key}),data:$($_o.formid).serialize(),success:function(html){dropdownMenu.html(html);dropdownMenu.find('a[data-val]').bind('click',function(){insertAtCaret($(this).parents('.db-table-bind-signs').eq(0).find('input[name^="db_tables"]').eq(0),$(this).attr('data-val'))})}})}});$('#db_table_bind_list').on('click','.db-table-bind-where-add',function(){$_o.db_table_bind_where_add(this)});$('#db_table_bind_list').on('click','.db-table-bind-where-del',function(){$(this).parents('tr').eq(0).remove()});$('#db_table_bind_list').on('click','.db-table-bind-query-add',function(){$_o.db_table_bind_query_add(this)});$('#db_table_bind_list').on('click','.db-table-bind-query-del',function(){$(this).parents('tr').eq(0).remove()});if(isObject(config.db_tables)&&config.db_tables.length>0){$('#db_tab_table .db-table-binding').addClass('loading');$_o.db_table_bind(null,1)}})},db_table_bind:function(curTable,isDbTables){var $_o=this;curTable=curTable?curTable:'';isDbTables=isDbTables?isDbTables:'';var bindUrl=ulink('release/dbTableBind?id=_id_&table=_tb_&is_db_tables=_dbtb_',{'_id_':$_o.releid,'_tb_':curTable,'_dbtb_':isDbTables});ajaxOpen({type:'get',url:bindUrl,dataType:'html',success:function(data){if(dataIsJson(data)){ajaxDataMsg(data)}else{$('#db_table_bind_list').append(data)}},complete:function(){$('#db_tab_table .db-table-binding').removeClass('loading').hide()}})},db_table_bind_load:function(dbTables){var $_o=this;if(isObject(dbTables)){for(var key in dbTables){var tBoxId='#db_table_t_'+key;var namePre='db_tables['+key+']';var dbTable=dbTables[key];if(isObject(dbTable)){$(tBoxId).find('[name="'+namePre+'[op]').val(dbTable.op).trigger('change');var opTypes=['where','query'];for(var opi in opTypes){var opType=opTypes[opi];if(isObject(dbTable[opType])){for(var i in dbTable[opType]){if(!isObject(dbTable[opType])){dbTable[opType][i]=[]}} +var dropdownMenu=boxObj.find('.dropdown-menu');if(dropdownMenu.length>0){dropdownMenu.html('');var key=$(this).parents('[id^="db_table_t_"]').eq(0).attr('data-key');ajaxOpen({type:'POST',dataType:'html',url:ulink('release/dbTableBindSings?table_key=_key_',{'_key_':key}),data:$($_o.formid).serialize(),success:function(html){dropdownMenu.html(html);dropdownMenu.find('a[data-val]').bind('click',function(){insertAtCaret($(this).parents('.db-table-bind-signs').eq(0).find('input[name^="db_tables"]').eq(0),$(this).attr('data-val'))})}})}});$('#db_table_bind_list').on('click','.db-table-bind-where-add',function(){$_o.db_table_bind_where_add(this)});$('#db_table_bind_list').on('click','.db-table-bind-where-del',function(){var curObj=$(this);confirmRight('确定删除？',function(){curObj.parents('tr').eq(0).remove()})});$('#db_table_bind_list').on('click','.db-table-bind-query-add',function(){$_o.db_table_bind_query_add(this)});$('#db_table_bind_list').on('click','.db-table-bind-query-del',function(){var curObj=$(this);confirmRight('确定删除？',function(){curObj.parents('tr').eq(0).remove()})});if(isObject(config.db_tables)&&config.db_tables.length>0){$('#db_tab_table .db-table-binding').addClass('loading');$_o.db_table_bind(null,1)}})},db_table_bind:function(curTable,isDbTables){var $_o=this;curTable=curTable?curTable:'';isDbTables=isDbTables?isDbTables:'';var bindUrl=ulink('release/dbTableBind?id=_id_&table=_tb_&is_db_tables=_dbtb_',{'_id_':$_o.releid,'_tb_':curTable,'_dbtb_':isDbTables});ajaxOpen({type:'get',url:bindUrl,dataType:'html',success:function(data){if(dataIsJson(data)){ajaxDataMsg(data)}else{$('#db_table_bind_list').append(data)}},complete:function(){$('#db_tab_table .db-table-binding').removeClass('loading').hide()}})},db_table_bind_load:function(dbTables){var $_o=this;if(isObject(dbTables)){for(var key in dbTables){var tBoxId='#db_table_t_'+key;var namePre='db_tables['+key+']';var dbTable=dbTables[key];if(isObject(dbTable)){$(tBoxId).find('[name="'+namePre+'[op]').val(dbTable.op).trigger('change');var opTypes=['where','query'];for(var opi in opTypes){var opType=opTypes[opi];if(isObject(dbTable[opType])){for(var i in dbTable[opType]){if(!isObject(dbTable[opType])){dbTable[opType][i]=[]}} for(var i in dbTable[opType].field){var opData={};for(var ii in dbTable[opType]){opData[ii]=dbTable[opType][ii][i]} $_o.db_table_bind_op_add(opType,key,opData)}}} if(isObject(dbTable.query)){for(var qk in dbTable.query){$(tBoxId).find('[name="'+namePre+'[field]['+qk+']"]').val(dbTable.query[qk])}} diff --git a/public/static/js/admin/tasks.js b/public/static/js/admin/tasks.js index 2e818ed..1554c94 100644 --- a/public/static/js/admin/tasks.js +++ b/public/static/js/admin/tasks.js @@ -8,13 +8,13 @@ |-------------------------------------------------------------------------- */ 'use strict';var tasksOpClass={get_task_id:function(obj){var taskId=$(obj).parents('tr[data-task-id]').eq(0).attr('data-task-id');taskId=taskId?taskId:0;return taskId},init_common:function(){$('table.datatable').on('click','.delete',function(){var obj=$(this);var url=ulink('task/op?op=delete&id=_id_',{'_id_':tasksOpClass.get_task_id(obj)});confirmRight(window.tpl_lang.confirm_delete,function(){ajaxOpen({type:"GET",url:url,dataType:"json",success:function(data){data.code==1?toastr.success(data.msg):toastr.error(data.msg);if(data.code==1){obj.parents('tr').eq(0).remove()}}})})});$('table.datatable').on('click','.auto',function(){var auto=1;var tips=[window.tpl_lang.task_auto_1,'green'];var val=$(this).attr('data-val');val=toInt(val);if(val!=0){auto=0;tips=[window.tpl_lang.task_auto_0,'red']} -var taskid=tasksOpClass.get_task_id(this);if(taskid>0){var $_o=$(this);var url=ulink('task/op?op=auto&auto=_auto_&id=_id_',{'_auto_':auto,'_id_':taskid});ajaxOpen({type:'GET',url:url,success:function(data){if(data.code==1){$_o.attr('data-val',auto);$_o.prop('title','');$_o.html(tips[0]);$_o.css('color',tips[1])}},dataType:'json'})}});var loadedFunc=function(){$('#myModal .modal-footer .close').html('关闭采集').prop('title','关闭并结束任务').addClass('btn btn-primary').removeClass('close');var btnBackstage=$('');btnBackstage.bind('click',function(){collectorEchoMsg.close_non_stop=!0});$('#myModal .modal-footer').prepend(btnBackstage)};$('table.datatable').on('click','.caiji',function(){var taskid=tasksOpClass.get_task_id(this);collectorWindow('任务采集','admin/task/collect?id=_id_',{'_id_':taskid},{loaded_func:loadedFunc,lg:1})});$('table.datatable').on('click','.caiji-batch',function(){var taskids=[];$('input[name="batch[]"]:checked').each(function(){taskids.push($(this).val())});collectorWindow('批量采集','admin/task/collectBatch?ids=_ids_',{'_ids_':taskids.join(',')},{loaded_func:loadedFunc,lg:1})});$('table.datatable').on('click','.houtai',function(){var taskid=tasksOpClass.get_task_id(this);tasksOpClass.backstage_collect(taskid)});$('table.datatable').on('click','.houtai-batch',function(){var taskids=[];$('input[name="batch[]"]:checked').each(function(){taskids.push($(this).val())});tasksOpClass.backstage_collect(taskids)});$('table.datatable thead th[data-order]').bind('click',function(){var order=$(this).attr('data-order');if(!order){return!1} +var taskid=tasksOpClass.get_task_id(this);if(taskid>0){var curObj=$(this);var url=ulink('task/op?op=auto&auto=_auto_&id=_id_',{'_auto_':auto,'_id_':taskid});ajaxOpen({type:'GET',url:url,success:function(data){if(data.code==1){curObj.attr('data-val',auto);curObj.prop('title','');curObj.html(tips[0]);curObj.css('color',tips[1])}},dataType:'json'})}});var loadedFunc=function(){$('#myModal .modal-footer .close').html('关闭采集').prop('title','关闭并结束任务').addClass('btn btn-primary').removeClass('close');var btnBackstage=$('');btnBackstage.bind('click',function(){collectorEchoMsg.close_non_stop=!0});$('#myModal .modal-footer').prepend(btnBackstage)};$('table.datatable').on('click','.caiji',function(){var taskid=tasksOpClass.get_task_id(this);collectorWindow('任务采集','admin/task/collect?id=_id_',{'_id_':taskid},{loaded_func:loadedFunc,lg:1})});$('table.datatable').on('click','.caiji-batch',function(){var taskids=[];$('input[name="batch[]"]:checked').each(function(){taskids.push($(this).val())});collectorWindow('批量采集','admin/task/collectBatch?ids=_ids_',{'_ids_':taskids.join(',')},{loaded_func:loadedFunc,lg:1})});$('table.datatable').on('click','.houtai',function(){var taskid=tasksOpClass.get_task_id(this);tasksOpClass.backstage_collect(taskid)});$('table.datatable').on('click','.houtai-batch',function(){var taskids=[];$('input[name="batch[]"]:checked').each(function(){taskids.push($(this).val())});tasksOpClass.backstage_collect(taskids)});$('table.datatable thead th[data-order]').bind('click',function(){var order=$(this).attr('data-order');if(!order){return!1} var className=$(this).prop('class');var sort='desc';if(className=='sorting_desc'){sort='asc'} -window.location.href=ulink('task/list?show=list&order='+order+'&sort='+sort);return!1})},init_folder:function(openedTgIds){tasksOpClass.init_common();$('#task_list_folder').on('click','.taskgroup',function(){tasksOpClass.open_folder($(this).parents('tr').eq(0).attr('data-tgid'))});tasksOpClass.open_folder('0',function(){if(isObject(openedTgIds)){for(var i in openedTgIds){tasksOpClass.open_folder(openedTgIds[i])}}})},open_folder:function(tgid,successFunc){var trBox=$('#task_list_folder').find('tr[data-tgid="'+tgid+'"]').eq(0);var tgObj=trBox.find('.taskgroup');var tgLevel=trBox.attr('data-level');var loadingImg='';var opened=tgObj.hasClass('taskgroup-opened')?true:!1;var childs=$('#task_list_folder tr[data-parent-tgid="'+tgid+'"]');childs.css('display',(opened?'none':'table-row'));childs.each(function(){var cTgid=$(this).attr('data-tgid');var cOpened=$(this).hasClass('taskgroup-opened')?true:!1;if(cTgid){if(opened){$('#task_list_folder tr[data-parent-tgid="'+cTgid+'"]').css('display','none')}else{$('#task_list_folder tr[data-parent-tgid="'+cTgid+'"]').css('display',cOpened?'table-row':'none')}}});if(opened){tgObj.removeClass('taskgroup-opened');ajaxOpen({type:"GET",url:ulink('task/tgClose?tg_id=_tgid_',{'_tgid_':tgid}),dataType:"json",success:function(data){}})}else{tgObj.addClass('taskgroup-opened');if(trBox.attr('data-setted')!=1){tgObj.parents('td').eq(0).append(loadingImg);ajaxOpen({type:"GET",url:ulink('task/tgOpen?tg_id=_tgid_',{'_tgid_':tgid}),dataType:"json",success:function(data){if(tgLevel>0){tgObj.siblings('.loading-sm').remove()}else{trBox.hide()} +window.location.href=ulink('task/list?show=list&order='+order+'&sort='+sort);return!1});this.task_collected_num()},task_collected_num:function(){var taskIds=[];$('tr[data-task-id]').each(function(){taskIds.push($(this).attr('data-task-id'))});if(taskIds.length>0){ajaxOpen({type:'POST',url:ulink('task/taskCollectedNum'),data:{'task_ids':taskIds},success:function(data){if(data.code==1){data=data.data;if(isObject(data)){for(var i in data){var num=data[i];if(isObject(num)){var trObj=$('tr[data-task-id="'+i+'"]');trObj.find('.today-num').text(num.today);trObj.find('.total-num').text(num.total)}}}}}})}},init_folder:function(openedTgIds){tasksOpClass.init_common();$('#task_list_folder').on('click','.taskgroup',function(){tasksOpClass.open_folder($(this).parents('tr').eq(0).attr('data-tgid'))});tasksOpClass.open_folder('0',function(){if(isObject(openedTgIds)){for(var i in openedTgIds){tasksOpClass.open_folder(openedTgIds[i])}}})},open_folder:function(tgid,successFunc){var $_o=this;var trBox=$('#task_list_folder').find('tr[data-tgid="'+tgid+'"]').eq(0);var tgObj=trBox.find('.taskgroup');var tgLevel=trBox.attr('data-level');var loadingImg='';var opened=tgObj.hasClass('taskgroup-opened')?true:!1;var childs=$('#task_list_folder tr[data-parent-tgid="'+tgid+'"]');childs.css('display',(opened?'none':'table-row'));childs.each(function(){var cTgid=$(this).attr('data-tgid');var cOpened=$(this).hasClass('taskgroup-opened')?true:!1;if(cTgid){if(opened){$('#task_list_folder tr[data-parent-tgid="'+cTgid+'"]').css('display','none')}else{$('#task_list_folder tr[data-parent-tgid="'+cTgid+'"]').css('display',cOpened?'table-row':'none')}}});if(opened){tgObj.removeClass('taskgroup-opened');ajaxOpen({type:"GET",url:ulink('task/tgClose?tg_id=_tgid_',{'_tgid_':tgid}),dataType:"json",success:function(data){}})}else{tgObj.addClass('taskgroup-opened');if(trBox.attr('data-setted')!=1){tgObj.parents('td').eq(0).append(loadingImg);ajaxOpen({type:"GET",url:ulink('task/tgOpen?tg_id=_tgid_',{'_tgid_':tgid}),dataType:"json",success:function(data){if(tgLevel>0){tgObj.siblings('.loading-sm').remove()}else{trBox.hide()} tgLevel=parseInt(tgLevel);var leftSpace=tgLevel>0?('padding-left:'+tgLevel*25+'px;'):'';var html='';if(data.code==1){if(isNull(data.data)){html=null}else{var html='';if(data.data.tgList){var datalist=data.data.tgList;for(var i in datalist){html+='- 规则 '+'
- |
- 发布 '+'
- |
- '+window.tpl_lang.delete+'
- 规则 '+'
- |
- 发布 '+'
- |
- '+window.tpl_lang.delete+'
'; + continue; + } + $ixName=count($ixName)>1?('i'.substr(md5(serialize($ixName)),8,16)):$ixName[0]; + + $lenElse=250-count($ixFields)*2+count($varcharLens)*2; + if(array_sum($varcharLens)>$lenElse){ + asort($varcharLens); + foreach ($varcharLens as $vlf=>$vlv){ + $varcharLen=intval($lenElse/(count($varcharLens))); + if($vlv>$varcharLen){ + $vlv=$varcharLen; + } + $ixFields[$vlf]=$vlf.'('.$vlv.')'; + $lenElse=$lenElse-$vlv; + unset($varcharLens[$vlf]); + } + } + $ixFields=implode(',',$ixFields); + try{ + db()->execute('ALTER TABLE `'.$dsTable->fullTableName().'` ADD '.$ixType.' `'.$ixName.'`('.$ixFields.')'); + }catch(\Exception $ex){ + $exMsg=$ex->getMessage(); + $exMsg=$dsTable->convertErrorColumn($exMsg,$fields); + $error.=$exMsg.'
'; + }; + } + } + if($error){ + $this->error($error,''); + }else{ + $this->success('操作成功','dataset/set?id='.$dsId); + } + }else{ + $this->assign('fields',$fields); + $this->assign('dbIndexes',$dbIndexes); + $this->assign('dsData',$dsData); + return $this->fetch(); + } + } + + public function dbAction(){ + $dsId=input('ds_id/d',0); + $mds=model('Dataset'); + $dsData=$dsId>0?$mds->getById($dsId):null; + if(empty($dsData)){ + $this->error('数据集不存在'); + } + $fields=$dsData['config']['fields']; + init_array($fields); + $dst=DatasetTable::getInstance($dsId); + + $mcache=\skycaiji\admin\model\CacheModel::getInstance(); + $cond=array(); + $search=array('id'=>input('id/d',0)); + if($search['id']<=0){ + unset($search['id']); + }else{ + $cond['id']=$search['id']; + } + foreach ($fields as $k=>$v){ + $searchK=input($k,''); + if(!is_empty($searchK,true)){ + $cond[$k]=array('like','%'.addslashes($searchK).'%'); + $search[$k]=$searchK; + } + } + $search['num']=input('num/d',0); + if($search['num']<=0){ + $search['num']=$mcache->getCache('dataset_db_list_num','data'); + } + $search['num']=max(30,intval($search['num'])); + $mcache->setCache('dataset_db_list_num',$search['num']); + $list=$dst->db()->where($cond)->order('id desc')->paginate($search['num'],false,paginate_auto_config()); + $pagenav=$list->render(); + $list=$list->all(); + foreach ($list as $k=>$v){ + init_array($v); + foreach ($v as $vk=>$vv){ + if($fields[$vk]&&$fields[$vk]['type']=='datetime'){ + $vv=$dst->convertDate($vv); + $v[$vk]=$vv; + } + } + $list[$k]=$v; + } + + $this->set_html_tags( + '数据集:'.$dsData['name'], + '数据集：'.$dsData['name'], + breadcrumb(array(array('url'=>url('dataset/set?id='.$dsId),'title'=>'数据集：'.$dsData['name']),array('url'=>url('dataset/db?ds_id='.$dsId),'title'=>'数据'))) + ); + $this->assign('search',$search); + $this->assign('dsData',$dsData); + $this->assign('list',$list); + $this->assign('fields',$fields); + $this->assign('pagenav',$pagenav); + return $this->fetch(); + } + public function dbSetAction(){ + $dsId=input('ds_id/d',0); + $mds=model('Dataset'); + $dsData=$dsId>0?$mds->getById($dsId):null; + if(empty($dsData)){ + $this->error('数据集不存在'); + } + $fields=$dsData['config']['fields']; + init_array($fields); + $dst=DatasetTable::getInstance($dsId); + if($this->request->isPost()){ + $ids=input('ids/a',array(),'intval'); + $postData=array(); + foreach ($fields as $k=>$v){ + $fieldData=input($k.'/a',array(),null); + if($v&&$v['type']=='datetime'){ + foreach ($fieldData as $fk=>$fv){ + $fieldData[$fk]=$dst->convertDate($fv); + } + } + $postData[$k]=$fieldData; + } + $upData=array(); + $newData=array(); + foreach ($ids as $ik=>$iv){ + if($iv>0){ + + $upData[$iv]=array('id'=>$iv); + foreach ($fields as $fk=>$fv){ + $upData[$iv][$fk]=$postData[$fk][$iv]; + } + }else{ + + foreach ($fields as $fk=>$fv){ + $newData[$iv][$fk]=$postData[$fk][$iv]; + } + } + } + $error=''; + try{ + if($upData){ + $dst->db()->strict(false)->insertAll($upData,true); + } + if($newData){ + foreach ($newData as $k=>$v){ + if(is_array($v)){ + + $isNull=true; + foreach ($v as $vk=>$vv){ + if(!is_empty($vv,true)){ + $isNull=false; + } + } + if($isNull){ + unset($newData[$k]); + } + } + } + if($newData){ + $dst->db()->strict(false)->insertAll($newData); + } + } + }catch(\Exception $ex){ + $error=$ex->getMessage(); + $error=$dst->convertErrorColumn($error,$fields); + } + if($error){ + $this->error($error,''); + }else{ + $this->success('操作成功',$newData?('dataset/db?ds_id='.$dsId):''); + } + }else{ + $this->error('操作失败',''); + } + } + public function dbDeleteAction(){ + $dsId=input('ds_id/d',0); + $mds=model('Dataset'); + $dsData=$dsId>0?$mds->getById($dsId):null; + if(empty($dsData)){ + $this->error('数据集不存在'); + } + $dst=DatasetTable::getInstance($dsId); + if($this->request->isPost()){ + $ids=input('ids/a',array(),'intval'); + init_array($ids); + if(!empty($ids)){ + $dst->db()->where('id','in',$ids)->delete(); + } + $this->success('删除成功','',$ids); + }else{ + $this->error('删除失败',''); + } + } +} \ No newline at end of file diff --git a/vendor/skycaiji/app/admin/controller/Develop.php b/vendor/skycaiji/app/admin/controller/Develop.php index 4f3bb59..870a1c9 100644 --- a/vendor/skycaiji/app/admin/controller/Develop.php +++ b/vendor/skycaiji/app/admin/controller/Develop.php @@ -395,7 +395,7 @@ EOF; /*开发应用*/ public function appAction(){ - $app=input('app'); + $app=input('app',''); $app=strtolower($app); $mapp=model('App'); $appData=null; diff --git a/vendor/skycaiji/app/admin/controller/Release.php b/vendor/skycaiji/app/admin/controller/Release.php index f5d9cbf..adcd965 100644 --- a/vendor/skycaiji/app/admin/controller/Release.php +++ b/vendor/skycaiji/app/admin/controller/Release.php @@ -218,8 +218,27 @@ class Release extends CollectController{ return $this->fetch(); } } - - + public function datasetAction(){ + $mds=model('Dataset'); + $taskId=input('task_id/d',0); + $dsId=input('ds_id/d',0); + $dsData=$mds->getById($dsId); + $fields=$dsData['config']['fields']; + init_array($fields); + + $collFields=array(); + if($taskId>0){ + $taskData=model('Task')->getById($taskId); + if(!empty($taskData)){ + $collFields=controller('admin/Rdb','event')->get_coll_fields($taskData['id'], $taskData['module']); + } + init_array($collFields); + } + $this->assign('dsData',$dsData); + $this->assign('fields',$fields); + $this->assign('collFields',$collFields); + return $this->fetch(); + } /*检测cms信息*/ public function cmsDetectAction(){ $acms=controller('admin/Rcms','event'); diff --git a/vendor/skycaiji/app/admin/controller/Task.php b/vendor/skycaiji/app/admin/controller/Task.php index feabb8f..68e1bda 100644 --- a/vendor/skycaiji/app/admin/controller/Task.php +++ b/vendor/skycaiji/app/admin/controller/Task.php @@ -204,6 +204,24 @@ class Task extends CollectController { $this->success('',''); } + public function taskCollectedNumAction(){ + $taskIds=input('task_ids/a',array(),'intval'); + + init_array($taskIds); + $list=array(); + if($taskIds){ + $mcollected=model('Collected'); + $todayTime=strtotime(date('Y-m-d',time())); + foreach ($taskIds as $taskId){ + $list[$taskId]=array( + 'today'=>$mcollected->where(array('task_id'=>array('=',$taskId),'addtime'=>array('>',$todayTime)))->count(), + 'total'=>$mcollected->where('task_id',$taskId)->count(), + ); + } + } + $this->success('','',$list); + } + private function _set_tasks($taskList){ if($taskList){ @@ -233,20 +251,6 @@ class Task extends CollectController { } } - $mcollected=model('Collected'); - $todayTime=strtotime(date('Y-m-d',time())); - foreach ($taskList as $k=>$v){ - $taskId=$v['id']; - if(empty($taskId)){ - continue; - } - $collected=array(); - $collected['today']=$mcollected->where(array('task_id'=>array('=',$taskId),'addtime'=>array('>',$todayTime)))->count(); - $collected['total']=$mcollected->where('task_id',$taskId)->count(); - $v['_collected_info']=$collected; - $taskList[$k]=$v; - } - $mrele=model('Release'); if($tids){ $releModules=$mrele->where('task_id','in',$tids)->column('module','task_id'); diff --git a/vendor/skycaiji/app/admin/controller/Taskgroup.php b/vendor/skycaiji/app/admin/controller/Taskgroup.php index dffabdb..dfc9f2a 100644 --- a/vendor/skycaiji/app/admin/controller/Taskgroup.php +++ b/vendor/skycaiji/app/admin/controller/Taskgroup.php @@ -188,7 +188,7 @@ class Taskgroup extends BaseController { $id=input('id/d',0); $op=input('op'); - $ops=array('item'=>array('delete','move'),'list'=>array('deleteall','saveall')); + $ops=array('item'=>array('delete','move'),'list'=>array('saveall')); if(!in_array($op,$ops['item'])&&!in_array($op,$ops['list'])){ $this->error(lang('invalid_op')); @@ -239,46 +239,15 @@ class Taskgroup extends BaseController { $this->assign('parentTgList',$parentTgList); return $this->fetch(); } - }elseif($op=='deleteall'){ - - $ids=input('ids/a',array()); - if(is_array($ids)&&count($ids)>0){ - $list=$mtaskgroup->where(array('id'=>array('in',$ids)))->column('*'); - $deleteIds=array(); - foreach ($list as $item){ - - $subCount=$mtaskgroup->where(array('parent_id'=>$item['id']))->count(); - if($subCount==0){ - $deleteIds[$item['id']]=$item['id']; - }else{ - $hasSub=true; - } - } - if($deleteIds){ - $mtaskgroup->where(array('id'=>array('in',$deleteIds)))->delete(); - $mtask->strict(false)->where(array('tg_id'=>array('in',$deleteIds)))->update(array('tg_id'=>0)); - } - } - $this->success(lang($hasSub?'tg_deleteall_has_sub':'op_success')); }elseif($op=='saveall'){ - $ids=input('ids/a',array()); $newsort=input('newsort/a',array()); - if(is_array($ids)&&count($ids)>0){ - $ids=array_map('intval', $ids); - - $updateSql=' UPDATE '.$mtaskgroup->getQuery()->getTable().' SET `sort` = CASE `id` '; - foreach ($ids as $tgid){ - $newsort[$tgid]=min(intval($newsort[$tgid]),999999); - $updateSql.= sprintf(" WHEN %d THEN '%s' ", $tgid, $newsort[$tgid]); - } - $updateSql.='END WHERE `id` IN ('. implode(',',$ids).')'; - try{ - $mtaskgroup->execute($updateSql); - }catch (\Exception $ex){ - $this->error(lang('op_failed')); - } - } + if(is_array($newsort)&&count($newsort)>0){ + foreach ($newsort as $key=>$val){ + $val=min(intval($val),999999); + $mtaskgroup->strict(false)->where('id',intval($key))->update(array('sort'=>$val)); + } + } $this->success(lang('op_success'),'list'); } } diff --git a/vendor/skycaiji/app/admin/controller/Tool.php b/vendor/skycaiji/app/admin/controller/Tool.php index 6ec2a79..4b80888 100644 --- a/vendor/skycaiji/app/admin/controller/Tool.php +++ b/vendor/skycaiji/app/admin/controller/Tool.php @@ -367,7 +367,7 @@ class Tool extends BaseController { $createSql.='PRIMARY KEY ('.implode(',', $primarys).')'; } - $createSql.=' ) ENGINE=MyISAM DEFAULT CHARSET=utf8'; + $createSql.=' ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4'; db()->execute($createSql); }else{ diff --git a/vendor/skycaiji/app/admin/event/CpatternEvent.php b/vendor/skycaiji/app/admin/event/CpatternEvent.php index add7f08..7cdfc09 100644 --- a/vendor/skycaiji/app/admin/event/CpatternEvent.php +++ b/vendor/skycaiji/app/admin/event/CpatternEvent.php @@ -126,25 +126,28 @@ class CpatternEvent extends CpatternColl{ break; case 'rule': - $val = $this->field_module_rule(array( - 'reg_rule'=>$field_params['reg_extract_rule'], - 'reg_rule_merge'=>$field_params['reg_extract_rule_merge'], - 'rule_multi'=>$field_params['extract_rule_multi'], - 'rule_multi_str'=>$field_params['extract_rule_multi_str'], - ), $field_html); - + $field_params['reg_rule']=$field_params['reg_extract_rule']; + $field_params['reg_rule_merge']=$field_params['reg_extract_rule_merge']; + $field_params['rule_multi']=$field_params['extract_rule_multi']; + $field_params['rule_multi_str']=$field_params['extract_rule_multi_str']; + $field_params['rule_multi_type']=$field_params['extract_rule_multi_type']; + $val = $this->field_module_rule($field_params, $field_html); break; case 'xpath': - $val = $this->field_module_xpath(array( - 'xpath' => $field_params['extract_xpath'], - 'xpath_attr' => $field_params['extract_xpath_attr'], - 'xpath_attr_custom' => $field_params['extract_xpath_attr_custom'], - 'xpath_multi' => $field_params['extract_xpath_multi'], - 'xpath_multi_str' => $field_params['extract_xpath_multi_str'], - ), $field_html); + $field_params['xpath']=$field_params['extract_xpath']; + $field_params['xpath_attr']=$field_params['extract_xpath_attr']; + $field_params['xpath_attr_custom']=$field_params['extract_xpath_attr_custom']; + $field_params['xpath_multi']=$field_params['extract_xpath_multi']; + $field_params['xpath_multi_str']=$field_params['extract_xpath_multi_str']; + $field_params['xpath_multi_type']=$field_params['extract_xpath_multi_type']; + $val = $this->field_module_xpath($field_params, $field_html); break; case 'json': - $val=$this->field_module_json(array('json'=>$field_params['extract_json'],'json_arr'=>$field_params['extract_json_arr'],'json_arr_implode'=>$field_params['extract_json_arr_implode']), $field_html); + $field_params['json']=$field_params['extract_json']; + $field_params['json_loop']=$field_params['extract_json_loop']; + $field_params['json_arr']=$field_params['extract_json_arr']; + $field_params['json_arr_implode']=$field_params['extract_json_arr_implode']; + $val = $this->field_module_json($field_params, $field_html); break; } return $val; @@ -357,8 +360,10 @@ class CpatternEvent extends CpatternColl{ } return $fieldVal; } - public function process_f_insert($fieldVal,$params){ + public function process_f_insert($fieldVal,$params,$curUrlMd5,$loopIndex,$contUrlMd5,$fieldName=''){ $txt=$params['insert_txt']; + $txt=$this->_replace_insert_fields($txt,$fieldVal,$curUrlMd5,$loopIndex); + if(empty($params['insert_loc'])){ $fieldVal.=$txt; }elseif($params['insert_loc']=='head'){ @@ -457,6 +462,11 @@ class CpatternEvent extends CpatternColl{ return $murl; },$fieldVal); } + if(in_array('img_tag', $params['tool_list'])){ + $fieldVal=preg_replace_callback('/(?]+)(?![\'\"])/i',function($match){ + return '