|
@@ -14,36 +14,48 @@ class Cron extends Core
|
|
|
$day[0] = date('Y-m-d-H');
|
|
|
$day[1] = date('Y-m-d-H', strtotime("-1 hour"));
|
|
|
if (isset($config['project'])) {
|
|
|
+ $log = Dever::config('base', 'project')->log;
|
|
|
foreach ($config['project'] as $k => $v) {
|
|
|
foreach ($day as $i => $j) {
|
|
|
$data = $this->getDataByProject($j, $v['id'], $v['key']);
|
|
|
- $this->write($data);
|
|
|
+ $this->write($data, $log);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
return 'ok';
|
|
|
}
|
|
|
|
|
|
- private function write($data)
|
|
|
+ private function write($data, $log)
|
|
|
{
|
|
|
|
|
|
$source = $data[0];
|
|
|
+ $desc = $data[1];
|
|
|
$time = explode('-', $source['time']);
|
|
|
$update['project_id'] = $source['project_id'];
|
|
|
$update['time'] = Dever::maketime($time[0] . '-' . $time[1] . '-' . $time[2] . ' ' . $time[3] . ':00:00');
|
|
|
$info = Dever::db('log/data')->one($update);
|
|
|
$update['pv'] = $source['pv'] ? $source['pv'] : 0;
|
|
|
$update['uv'] = $source['uv'] ? $source['uv'] : 0;
|
|
|
+ $update['year'] = $time[0];
|
|
|
+ $update['month'] = $time[1];
|
|
|
+ $update['day'] = $time[2];
|
|
|
+ $update['hour'] = $time[3];
|
|
|
if (!$info) {
|
|
|
- $update['year'] = $time[0];
|
|
|
- $update['month'] = $time[1];
|
|
|
- $update['day'] = $time[2];
|
|
|
- $update['hour'] = $time[3];
|
|
|
Dever::db('log/data')->insert($update);
|
|
|
} else {
|
|
|
$update['where_id'] = $info['id'];
|
|
|
Dever::db('log/data')->update($update);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if (isset($log['cron']) && $log['cron']) {
|
|
|
+ $data[2] = $update;
|
|
|
+ foreach ($log['cron'] as $k => $v) {
|
|
|
+ Dever::load($v, $data);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private function getDataByProject($day, $id, $key)
|