diff --git a/app/Models/Report.php b/app/Models/Report.php index 100ba10a..1b5dca7f 100644 --- a/app/Models/Report.php +++ b/app/Models/Report.php @@ -144,15 +144,15 @@ class Report extends AbstractModel // 如果设置了周期偏移量 empty( $offset ) || $now_dt->subWeeks( abs( $offset ) ); $now_dt->startOfWeek(); // 设置为当周第一天 - return $now_dt->year . $now_dt->weekOfYear . $now_dt->month . $now_dt->weekOfMonth; + return $now_dt->year . $now_dt->weekOfYear; }, Report::DAILY => function() use ($now_dt, $offset) { // 如果设置了周期偏移量 empty( $offset ) || $now_dt->subDays( abs( $offset ) ); - return $now_dt->year . $now_dt->dayOfYear . $now_dt->month . $now_dt->daysInMonth; + return $now_dt->format("Ymd"); }, default => "", }; - return md5( $user->userid . ( is_callable($time_s) ? $time_s() : "" ) . $type ); + return $user->userid . ( is_callable($time_s) ? $time_s() : "" ); } }