Merge branch 'feature/article' into develop

This commit is contained in:
2025-06-27 17:15:54 +08:00
3 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -53,7 +53,6 @@ class ArticleController extends BaseController
if ($comment['avatar']) { if ($comment['avatar']) {
$comment['avatar_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($comment['avatar']); $comment['avatar_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($comment['avatar']);
} }
$comment['created_at'] = date('Y-m-d H:i:s', $comment['created_at']);
} }
unset($comment); unset($comment);
} }
@@ -76,6 +75,7 @@ class ArticleController extends BaseController
$params['filters'] = []; $params['filters'] = [];
$params['filters'][] = ['field' => 'status', 'operator' => '=', 'value' => 1]; $params['filters'][] = ['field' => 'status', 'operator' => '=', 'value' => 1];
$params['filters'][] = ['field' => 'locale', 'operator' => '=', 'value' => locale()]; $params['filters'][] = ['field' => 'locale', 'operator' => '=', 'value' => locale()];
$params['filters'][] = ['field' => 'publish_time', 'operator' => '<', 'value' => time()];
} }
+5
View File
@@ -53,4 +53,9 @@ class CommentModel extends Model
* 不允许自动填充模型字段 * 不允许自动填充模型字段
*/ */
protected $guarded = []; protected $guarded = [];
protected function serializeDate(\DateTimeInterface $date)
{
return $date->format('Y-m-d H:i:s'); // 统一格式化为字符串
}
} }
+2 -2
View File
@@ -70,9 +70,9 @@ class ArticleController extends BaseController
if ($scene === 'default') { if ($scene === 'default') {
$params['filters'] = []; $params['filters'] = [];
$params['filters'][] = ['field' => 'status', 'operator' => '=', 'value' => 1]; // $params['filters'][] = ['field' => 'status', 'operator' => '=', 'value' => 1];
$params['filters'][] = ['field' => 'locale', 'operator' => '=', 'value' => locale()]; $params['filters'][] = ['field' => 'locale', 'operator' => '=', 'value' => locale()];
$params['filters'][] = ['field' => 'publish_time', 'operator' => '<', 'value' => time()]; // $params['filters'][] = ['field' => 'publish_time', 'operator' => '<', 'value' => time()];
} }