内核更新

This commit is contained in:
2017-02-06 17:22:50 +08:00
parent 5e41d6862a
commit 689376a5d9
13 changed files with 213 additions and 91 deletions

View File

@@ -131,16 +131,17 @@ trait Jump
* @param string $url 跳转的URL表达式
* @param array|integer $params 其它URL参数
* @param integer $code http code
* @param array $with 隐式传参
* @return void
*/
protected function redirect($url, $params = [], $code = 302)
protected function redirect($url, $params = [], $code = 302, $with = [])
{
$response = new Redirect($url);
if (is_integer($params)) {
$code = $params;
$params = [];
}
$response->code($code)->params($params);
$response->code($code)->params($params)->with($with);
throw new HttpResponseException($response);
}

View File

@@ -42,7 +42,7 @@ trait SoftDelete
{
$model = new static();
$field = $model->getDeleteTimeField(true);
return $model->db(false)->where($field, 'exp', 'is not null');
return $model->db(false)->whereNotNull($field);
}
/**
@@ -129,7 +129,7 @@ trait SoftDelete
protected function base($query)
{
$field = $this->getDeleteTimeField(true);
$query->where($field, 'null');
$query->whereNull($field);
}
/**