|
@@ -66,7 +66,7 @@ discard block |
|
|
block discarded – undo |
|
66
|
66
|
public function get(string $key, ?string $member = null) |
|
67
|
67
|
{ |
|
68
|
68
|
if(! empty($member) || is_numeric($member)) { |
|
69
|
|
- return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => $member]) |
|
|
69
|
+ return $this->model->where(['primary_key' => $this->prefix.$key, 'secondary_key' => $member]) |
|
70
|
70
|
->where(function($q) { |
|
71
|
71
|
return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at'); |
|
72
|
72
|
}) |
|
@@ -193,7 +193,7 @@ discard block |
|
|
block discarded – undo |
|
193
|
193
|
{ |
|
194
|
194
|
$time = \Carbon\Carbon::now()->addSeconds($time); |
|
195
|
195
|
|
|
196
|
|
- return $this->model->where(['primary_key' => $this->prefix.$key]) |
|
|
196
|
+ return $this->model->where(['primary_key' => $this->prefix.$key]) |
|
197
|
197
|
->where(function($q) { |
|
198
|
198
|
return $q->where('expired_at', '>', \Carbon\Carbon::now())->orWhereNull('expired_at'); |
|
199
|
199
|
}) |
Please login to merge, or discard this patch.