Compare commits
11 Commits
eb4e71ee77
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
929802978c | ||
|
|
02a21a8e45 | ||
|
|
d4f0020c2c | ||
|
|
3161470a7d | ||
|
|
45368c64bf | ||
|
|
955f46c9ca | ||
|
|
615c819e97 | ||
|
|
9e277de65d | ||
|
|
00acc59cc4 | ||
|
|
764c446efd | ||
|
|
6de9464401 |
12
.env.example
12
.env.example
@@ -1,12 +1,14 @@
|
|||||||
# ============= БАЗА ДАННЫХ =============
|
# ============= БАЗА ДАННЫХ =============
|
||||||
DATABASE_URL=postgresql+asyncpg://news_admin:news_secure_2026@192.168.1.11:5432/news
|
DATABASE_URL=postgresql+asyncpg://db_user:db_password@db-host:5432/news
|
||||||
|
|
||||||
# ============= MINIO / ХРАНИЛИЩЕ =============
|
# ============= MINIO / ХРАНИЛИЩЕ =============
|
||||||
MINIO_ENDPOINT=minio:9000
|
MINIO_ENDPOINT=minio-host:9000
|
||||||
MINIO_ACCESS_KEY=minioadmin
|
MINIO_ACCESS_KEY=your-access-key
|
||||||
MINIO_SECRET_KEY=minioadmin
|
MINIO_SECRET_KEY=your-secret-key
|
||||||
MINIO_BUCKET=news-media
|
MINIO_BUCKET=news-media
|
||||||
MINIO_PUBLIC_URL=http://localhost:9000
|
# MINIO_PUBLIC_URL — публичный URL через который браузер загружает медиа.
|
||||||
|
# nginx проксирует /media/ → MinIO bucket, поэтому ставим домен сайта + /media (без имени бакета)
|
||||||
|
MINIO_PUBLIC_URL=https://your-domain.ru/media
|
||||||
|
|
||||||
# ============= JWT / БЕЗОПАСНОСТЬ =============
|
# ============= JWT / БЕЗОПАСНОСТЬ =============
|
||||||
JWT_SECRET=your-super-secret-key-change-in-production
|
JWT_SECRET=your-super-secret-key-change-in-production
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ class VkSource(Base):
|
|||||||
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
||||||
group_id: Mapped[str] = mapped_column(String(50), unique=True) # числовой ID без минуса
|
group_id: Mapped[str] = mapped_column(String(50), unique=True) # числовой ID без минуса
|
||||||
group_name: Mapped[str] = mapped_column(String(200)) # станет названием категории
|
group_name: Mapped[str] = mapped_column(String(200)) # станет названием категории
|
||||||
|
screen_name: Mapped[str | None] = mapped_column(String(200), nullable=True) # screen_name для корректных URL
|
||||||
enabled: Mapped[bool] = mapped_column(Boolean, default=True)
|
enabled: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||||
strict_filter: Mapped[bool] = mapped_column(Boolean, default=True) # True = только посты с тегами
|
strict_filter: Mapped[bool] = mapped_column(Boolean, default=True) # True = только посты с тегами
|
||||||
last_run: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
last_run: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
"""add screen_name to vk_sources
|
||||||
|
|
||||||
|
Revision ID: b2c3d4e5f6a7
|
||||||
|
Revises: a1b2c3d4e5f6
|
||||||
|
Create Date: 2026-05-20 18:00:00.000000
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
revision: str = 'b2c3d4e5f6a7'
|
||||||
|
down_revision: Union[str, None] = 'a1b2c3d4e5f6'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
op.add_column('vk_sources',
|
||||||
|
sa.Column('screen_name', sa.String(200), nullable=True)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
op.drop_column('vk_sources', 'screen_name')
|
||||||
@@ -113,3 +113,61 @@ async def system_status(db: AsyncSession = Depends(get_db), _: str = Depends(req
|
|||||||
"redis": redis,
|
"redis": redis,
|
||||||
"minio": minio,
|
"minio": minio,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/repair-media-urls")
|
||||||
|
async def repair_media_urls(db: AsyncSession = Depends(get_db), _: str = Depends(require_admin)):
|
||||||
|
"""Заменяет старые MinIO URL на актуальный MINIO_PUBLIC_URL во всех статьях и медиафайлах.
|
||||||
|
|
||||||
|
Системный nginx проксирует /media/ → MinIO bucket /news-media/, поэтому bucket исключается из URL.
|
||||||
|
Старый формат: http://host:port/news-media/object_path
|
||||||
|
Новый формат: MINIO_PUBLIC_URL/object_path (без bucket)
|
||||||
|
|
||||||
|
Запускать один раз после изменения MINIO_PUBLIC_URL в .env.
|
||||||
|
"""
|
||||||
|
new_base = MINIO_PUBLIC_URL.rstrip("/")
|
||||||
|
|
||||||
|
# cover_url: http://host/news-media/path → new_base/path
|
||||||
|
r_cover = await db.execute(text(r"""
|
||||||
|
UPDATE articles
|
||||||
|
SET cover_url = :new_base || '/' ||
|
||||||
|
regexp_replace(cover_url, '^https?://[^/]+(:[0-9]+)?/[^/]+/', '')
|
||||||
|
WHERE cover_url IS NOT NULL
|
||||||
|
AND cover_url LIKE '%/news-media/%'
|
||||||
|
AND cover_url NOT LIKE :prefix
|
||||||
|
RETURNING id
|
||||||
|
"""), {"new_base": new_base, "prefix": new_base + "%"})
|
||||||
|
|
||||||
|
# HTML-контент: только MinIO URL вида src="http://host/news-media/path"
|
||||||
|
# Точный паттерн: URL содержит /news-media/ — не трогаем другие ссылки
|
||||||
|
r_content = await db.execute(text(r"""
|
||||||
|
UPDATE articles
|
||||||
|
SET content = regexp_replace(
|
||||||
|
content,
|
||||||
|
'https?://[^/''"]+(:[0-9]+)?/news-media/([^''">]+)',
|
||||||
|
:new_base || '/\2',
|
||||||
|
'g'
|
||||||
|
)
|
||||||
|
WHERE content LIKE '%/news-media/%'
|
||||||
|
AND content NOT LIKE :prefix
|
||||||
|
RETURNING id
|
||||||
|
"""), {"new_base": new_base, "prefix": "%" + new_base + "%"})
|
||||||
|
|
||||||
|
# media.url
|
||||||
|
r_media = await db.execute(text(r"""
|
||||||
|
UPDATE media
|
||||||
|
SET url = :new_base || '/' ||
|
||||||
|
regexp_replace(url, '^https?://[^/]+(:[0-9]+)?/[^/]+/', '')
|
||||||
|
WHERE url LIKE '%/news-media/%'
|
||||||
|
AND url NOT LIKE :prefix
|
||||||
|
RETURNING id
|
||||||
|
"""), {"new_base": new_base, "prefix": new_base + "%"})
|
||||||
|
|
||||||
|
await db.commit()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"new_base": new_base,
|
||||||
|
"cover_url_fixed": r_cover.rowcount,
|
||||||
|
"content_fixed": r_content.rowcount,
|
||||||
|
"media_fixed": r_media.rowcount,
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import httpx
|
||||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException # BackgroundTasks используется в history endpoints
|
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException # BackgroundTasks используется в history endpoints
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
@@ -18,11 +19,30 @@ class SourceIn(BaseModel):
|
|||||||
strict_filter: bool = True
|
strict_filter: bool = True
|
||||||
|
|
||||||
|
|
||||||
|
async def _fetch_screen_name(group_id: str) -> str | None:
|
||||||
|
if not VK_TOKEN:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=5) as client:
|
||||||
|
r = await client.get(
|
||||||
|
"https://api.vk.com/method/groups.getById",
|
||||||
|
params={"group_ids": group_id, "access_token": VK_TOKEN, "v": "5.131"},
|
||||||
|
)
|
||||||
|
data = r.json()
|
||||||
|
groups = data.get("response", [])
|
||||||
|
if groups:
|
||||||
|
return groups[0].get("screen_name")
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def _source_dict(s: VkSource) -> dict:
|
def _source_dict(s: VkSource) -> dict:
|
||||||
return {
|
return {
|
||||||
"id": str(s.id),
|
"id": str(s.id),
|
||||||
"group_id": s.group_id,
|
"group_id": s.group_id,
|
||||||
"group_name": s.group_name,
|
"group_name": s.group_name,
|
||||||
|
"screen_name": s.screen_name,
|
||||||
"enabled": s.enabled,
|
"enabled": s.enabled,
|
||||||
"strict_filter": s.strict_filter,
|
"strict_filter": s.strict_filter,
|
||||||
"last_run": s.last_run.isoformat() if s.last_run else None,
|
"last_run": s.last_run.isoformat() if s.last_run else None,
|
||||||
@@ -58,7 +78,8 @@ async def add_source(data: SourceIn, db: AsyncSession = Depends(get_db), _: str
|
|||||||
exists = (await db.execute(select(VkSource).where(VkSource.group_id == group_id))).scalar_one_or_none()
|
exists = (await db.execute(select(VkSource).where(VkSource.group_id == group_id))).scalar_one_or_none()
|
||||||
if exists:
|
if exists:
|
||||||
raise HTTPException(status_code=409, detail="Источник с таким group_id уже есть")
|
raise HTTPException(status_code=409, detail="Источник с таким group_id уже есть")
|
||||||
source = VkSource(group_id=group_id, group_name=data.group_name, enabled=data.enabled, strict_filter=data.strict_filter)
|
screen_name = await _fetch_screen_name(group_id)
|
||||||
|
source = VkSource(group_id=group_id, group_name=data.group_name, screen_name=screen_name, enabled=data.enabled, strict_filter=data.strict_filter)
|
||||||
db.add(source)
|
db.add(source)
|
||||||
await db.commit()
|
await db.commit()
|
||||||
await db.refresh(source)
|
await db.refresh(source)
|
||||||
@@ -74,6 +95,8 @@ async def update_source(source_id: str, data: SourceIn, db: AsyncSession = Depen
|
|||||||
source.group_name = data.group_name
|
source.group_name = data.group_name
|
||||||
source.enabled = data.enabled
|
source.enabled = data.enabled
|
||||||
source.strict_filter = data.strict_filter
|
source.strict_filter = data.strict_filter
|
||||||
|
if not source.screen_name:
|
||||||
|
source.screen_name = await _fetch_screen_name(source.group_id)
|
||||||
await db.commit()
|
await db.commit()
|
||||||
await db.refresh(source)
|
await db.refresh(source)
|
||||||
return _source_dict(source)
|
return _source_dict(source)
|
||||||
|
|||||||
@@ -62,9 +62,13 @@ async def list_news(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if category:
|
if category:
|
||||||
cat = (await db.execute(select(Category).where(Category.slug == category))).scalar_one_or_none()
|
# Поддержка нескольких колледжей: category="slug1,slug2,..."
|
||||||
if cat:
|
slugs = [s for s in (part.strip() for part in category.split(",")) if s]
|
||||||
base = base.where(Article.category_id == cat.id)
|
cat_ids = (
|
||||||
|
await db.execute(select(Category.id).where(Category.slug.in_(slugs)))
|
||||||
|
).scalars().all()
|
||||||
|
if cat_ids:
|
||||||
|
base = base.where(Article.category_id.in_(cat_ids))
|
||||||
else:
|
else:
|
||||||
return {"total": 0, "offset": offset, "limit": limit, "has_more": False, "items": []}
|
return {"total": 0, "offset": offset, "limit": limit, "has_more": False, "items": []}
|
||||||
|
|
||||||
|
|||||||
@@ -162,7 +162,8 @@ async def _upload_from_url(url: str, db: AsyncSession | None = None,
|
|||||||
mc = _minio_client()
|
mc = _minio_client()
|
||||||
_ensure_bucket(mc)
|
_ensure_bucket(mc)
|
||||||
mc.put_object(MINIO_BUCKET, object_name, io.BytesIO(data), len(data), content_type=ct)
|
mc.put_object(MINIO_BUCKET, object_name, io.BytesIO(data), len(data), content_type=ct)
|
||||||
public_url = f"{MINIO_PUBLIC_URL}/{MINIO_BUCKET}/{object_name}"
|
# Системный nginx проксирует /media/ → MinIO bucket, поэтому bucket не дублируем в URL
|
||||||
|
public_url = f"{MINIO_PUBLIC_URL}/{object_name}"
|
||||||
if db is not None:
|
if db is not None:
|
||||||
from bd.models import Media
|
from bd.models import Media
|
||||||
db.add(Media(
|
db.add(Media(
|
||||||
@@ -302,7 +303,7 @@ async def _download_vk_video(owner_id: int, video_id: int,
|
|||||||
mc = _minio_client()
|
mc = _minio_client()
|
||||||
_ensure_bucket(mc)
|
_ensure_bucket(mc)
|
||||||
mc.put_object(MINIO_BUCKET, object_name, io.BytesIO(data), len(data), content_type="video/mp4")
|
mc.put_object(MINIO_BUCKET, object_name, io.BytesIO(data), len(data), content_type="video/mp4")
|
||||||
public_url = f"{MINIO_PUBLIC_URL}/{MINIO_BUCKET}/{object_name}"
|
public_url = f"{MINIO_PUBLIC_URL}/{object_name}"
|
||||||
print(f"[VK] Видео загружено в MinIO: {object_name} ({total/1024/1024:.1f}MB)")
|
print(f"[VK] Видео загружено в MinIO: {object_name} ({total/1024/1024:.1f}MB)")
|
||||||
if db is not None:
|
if db is not None:
|
||||||
from bd.models import Media
|
from bd.models import Media
|
||||||
@@ -360,8 +361,8 @@ async def _slug_exists(slug: str, db: AsyncSession) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
async def _vk_post_exists(owner_id: int, post_id: int, db: AsyncSession) -> bool:
|
async def _vk_post_exists(owner_id: int, post_id: int, db: AsyncSession) -> bool:
|
||||||
source_url = f"https://vk.com/wall{owner_id}_{post_id}"
|
pattern = f"%wall{owner_id}_{post_id}%"
|
||||||
r = await db.execute(select(Article.id).where(Article.source_url == source_url))
|
r = await db.execute(select(Article.id).where(Article.source_url.like(pattern)))
|
||||||
return r.scalar_one_or_none() is not None
|
return r.scalar_one_or_none() is not None
|
||||||
|
|
||||||
|
|
||||||
@@ -387,13 +388,17 @@ async def _get_or_create_tag(name: str, db: AsyncSession) -> Tag:
|
|||||||
|
|
||||||
# ── Post processing ───────────────────────────────────────────────────────────
|
# ── Post processing ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
async def _process_post(post: dict, category_name: str, db: AsyncSession, strict_filter: bool = True) -> bool:
|
async def _process_post(post: dict, category_name: str, db: AsyncSession, strict_filter: bool = True, screen_name: str | None = None) -> str:
|
||||||
|
"""Обрабатывает один VK-пост. Возвращает статус:
|
||||||
|
"imported" — пост сохранён; "exists" — уже есть в БД (догнали историю);
|
||||||
|
"skipped" — пропущен по другой причине (репост известной группы / фильтр / пустой).
|
||||||
|
"""
|
||||||
owner_id = post["owner_id"]
|
owner_id = post["owner_id"]
|
||||||
post_id = post["id"]
|
post_id = post["id"]
|
||||||
vk_slug = _vk_slug(owner_id, post_id)
|
vk_slug = _vk_slug(owner_id, post_id)
|
||||||
|
|
||||||
if await _vk_post_exists(owner_id, post_id, db):
|
if await _vk_post_exists(owner_id, post_id, db):
|
||||||
return False
|
return "exists"
|
||||||
|
|
||||||
text = post.get("text", "")
|
text = post.get("text", "")
|
||||||
attachments = post.get("attachments", [])
|
attachments = post.get("attachments", [])
|
||||||
@@ -409,7 +414,7 @@ async def _process_post(post: dict, category_name: str, db: AsyncSession, strict
|
|||||||
)).scalar_one_or_none()
|
)).scalar_one_or_none()
|
||||||
if in_db:
|
if in_db:
|
||||||
# Оригинал придёт сам из своей группы — пропускаем
|
# Оригинал придёт сам из своей группы — пропускаем
|
||||||
return False
|
return "skipped"
|
||||||
# Берём содержимое оригинала; комментарий репостера добавляем в начало
|
# Берём содержимое оригинала; комментарий репостера добавляем в начало
|
||||||
orig_text = original.get("text", "")
|
orig_text = original.get("text", "")
|
||||||
orig_atts = original.get("attachments", [])
|
orig_atts = original.get("attachments", [])
|
||||||
@@ -420,7 +425,7 @@ async def _process_post(post: dict, category_name: str, db: AsyncSession, strict
|
|||||||
# strict_filter=True: пропускаем пост если нет тегов
|
# strict_filter=True: пропускаем пост если нет тегов
|
||||||
# strict_filter=False: импортируем всё, теги назначаем если найдены
|
# strict_filter=False: импортируем всё, теги назначаем если найдены
|
||||||
if strict_filter and not tag_names:
|
if strict_filter and not tag_names:
|
||||||
return False
|
return "skipped"
|
||||||
|
|
||||||
# Заранее генерируем UUID и slug — используются в путях MinIO
|
# Заранее генерируем UUID и slug — используются в путях MinIO
|
||||||
article_id = uuid.uuid4()
|
article_id = uuid.uuid4()
|
||||||
@@ -544,7 +549,7 @@ async def _process_post(post: dict, category_name: str, db: AsyncSession, strict
|
|||||||
|
|
||||||
content = _sanitize("\n".join(content_parts))
|
content = _sanitize("\n".join(content_parts))
|
||||||
if not content.strip():
|
if not content.strip():
|
||||||
return False
|
return "skipped"
|
||||||
|
|
||||||
title = _early_title
|
title = _early_title
|
||||||
title_slug = _early_slug
|
title_slug = _early_slug
|
||||||
@@ -561,6 +566,9 @@ async def _process_post(post: dict, category_name: str, db: AsyncSession, strict
|
|||||||
created_at = datetime.utcfromtimestamp(ts)
|
created_at = datetime.utcfromtimestamp(ts)
|
||||||
published_at = created_at if status == ArticleStatus.published else None
|
published_at = created_at if status == ArticleStatus.published else None
|
||||||
|
|
||||||
|
if screen_name:
|
||||||
|
source_url = f"https://vk.com/{screen_name}?w=wall{owner_id}_{post_id}"
|
||||||
|
else:
|
||||||
source_url = f"https://vk.com/wall{owner_id}_{post_id}"
|
source_url = f"https://vk.com/wall{owner_id}_{post_id}"
|
||||||
|
|
||||||
article = Article(
|
article = Article(
|
||||||
@@ -590,7 +598,7 @@ async def _process_post(post: dict, category_name: str, db: AsyncSession, strict
|
|||||||
.values(article_id=article_id)
|
.values(article_id=article_id)
|
||||||
)
|
)
|
||||||
await db.commit()
|
await db.commit()
|
||||||
return True
|
return "imported"
|
||||||
|
|
||||||
|
|
||||||
# ── VK API fetch ──────────────────────────────────────────────────────────────
|
# ── VK API fetch ──────────────────────────────────────────────────────────────
|
||||||
@@ -670,13 +678,16 @@ async def run_import() -> dict:
|
|||||||
break
|
break
|
||||||
|
|
||||||
batch_new = 0
|
batch_new = 0
|
||||||
|
batch_existing = 0
|
||||||
for post in posts:
|
for post in posts:
|
||||||
try:
|
try:
|
||||||
ok = await _process_post(post, source.group_name, db, source.strict_filter)
|
st = await _process_post(post, source.group_name, db, source.strict_filter, screen_name=source.screen_name)
|
||||||
if ok:
|
if st == "imported":
|
||||||
imported += 1; grp_new += 1; batch_new += 1
|
imported += 1; grp_new += 1; batch_new += 1
|
||||||
else:
|
else:
|
||||||
skipped += 1; grp_skip += 1
|
skipped += 1; grp_skip += 1
|
||||||
|
if st == "exists":
|
||||||
|
batch_existing += 1
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
print(f"[VK] ✗ Пост {post.get('id')}: {exc}")
|
print(f"[VK] ✗ Пост {post.get('id')}: {exc}")
|
||||||
errors += 1; grp_err += 1
|
errors += 1; grp_err += 1
|
||||||
@@ -687,7 +698,16 @@ async def run_import() -> dict:
|
|||||||
|
|
||||||
await asyncio.sleep(1.5)
|
await asyncio.sleep(1.5)
|
||||||
|
|
||||||
if batch_new == 0 or len(posts) < batch or not VK_TOKEN:
|
# Условие остановки:
|
||||||
|
# — строгий фильтр: новых тегированных постов в батче нет → догнали.
|
||||||
|
# — без фильтра: останавливаемся только когда ВЕСЬ батч уже в БД,
|
||||||
|
# иначе пропустили бы более старые нетегированные посты (ранняя остановка).
|
||||||
|
if source.strict_filter:
|
||||||
|
caught_up = batch_new == 0
|
||||||
|
else:
|
||||||
|
caught_up = batch_existing == len(posts)
|
||||||
|
|
||||||
|
if caught_up or len(posts) < batch or not VK_TOKEN:
|
||||||
print(f"[VK] Догнали до уже импортированных, останавливаем группу")
|
print(f"[VK] Догнали до уже импортированных, останавливаем группу")
|
||||||
break
|
break
|
||||||
|
|
||||||
@@ -745,8 +765,8 @@ async def run_history_import(group_id: str | None = None, since_days: int = 365)
|
|||||||
hit_cutoff = True
|
hit_cutoff = True
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
ok = await _process_post(post, source.group_name, db, source.strict_filter)
|
st = await _process_post(post, source.group_name, db, source.strict_filter, screen_name=source.screen_name)
|
||||||
if ok:
|
if st == "imported":
|
||||||
imported += 1; grp_new += 1; batch_new += 1
|
imported += 1; grp_new += 1; batch_new += 1
|
||||||
else:
|
else:
|
||||||
skipped += 1; grp_skip += 1
|
skipped += 1; grp_skip += 1
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ services:
|
|||||||
api:
|
api:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget -qO- http://localhost/ || exit 1"]
|
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1/ || exit 1"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
|||||||
@@ -1,20 +1,46 @@
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
# Главное React-приложение
|
|
||||||
location / {
|
|
||||||
root /usr/share/nginx/html/app;
|
root /usr/share/nginx/html/app;
|
||||||
try_files $uri /index.html;
|
|
||||||
|
# Named location — отдаёт React SPA без повторной маршрутизации
|
||||||
|
location @spa {
|
||||||
|
add_header Cache-Control "no-store, must-revalidate";
|
||||||
|
try_files /index.html =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Корневая страница — index.html никогда не кешируем, чтобы всегда грузился
|
||||||
|
# актуальный билд (ассеты внутри — с хешами в имени)
|
||||||
|
location = / {
|
||||||
|
add_header Cache-Control "no-store, must-revalidate";
|
||||||
|
try_files /index.html =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Статические ассеты приложения (JS, CSS, шрифты, картинки) — имена с хешем,
|
||||||
|
# можно кешировать надолго
|
||||||
|
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|json|map)$ {
|
||||||
|
add_header Cache-Control "public, max-age=31536000, immutable";
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Админ-панель — React SPA, все вложенные пути разрешены
|
||||||
|
location ^~ /admin {
|
||||||
|
try_files $uri @spa;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Редактор статей (отдельный React-билд)
|
# Редактор статей (отдельный React-билд)
|
||||||
location /editor/ {
|
location ^~ /editor/ {
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
try_files $uri /editor/index.html;
|
try_files $uri @editor_spa;
|
||||||
|
}
|
||||||
|
|
||||||
|
location @editor_spa {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
try_files /editor/index.html =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Статические ассеты редактора (Vite base: '/editor-assets/')
|
# Статические ассеты редактора (Vite base: '/editor-assets/')
|
||||||
location /editor-assets/ {
|
location ^~ /editor-assets/ {
|
||||||
alias /usr/share/nginx/html/editor/;
|
alias /usr/share/nginx/html/editor/;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,10 +49,14 @@ server {
|
|||||||
proxy_pass http://api:8000/;
|
proxy_pass http://api:8000/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
# Отключаем буферизацию для быстрого ответа
|
|
||||||
proxy_buffering off;
|
proxy_buffering off;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Всё остальное — редирект на корень
|
||||||
|
location / {
|
||||||
|
return 302 /;
|
||||||
|
}
|
||||||
|
|
||||||
gzip on;
|
gzip on;
|
||||||
gzip_types text/plain text/css application/json application/javascript text/xml application/xml;
|
gzip_types text/plain text/css application/json application/javascript text/xml application/xml;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,3 +114,6 @@ export const adminVkImportHistory = (token, sourceId, sinceDays = 365) =>
|
|||||||
|
|
||||||
export const adminSystemStatus = token =>
|
export const adminSystemStatus = token =>
|
||||||
req('GET', 'admin/system/status', token)
|
req('GET', 'admin/system/status', token)
|
||||||
|
|
||||||
|
export const adminRepairMediaUrls = token =>
|
||||||
|
req('POST', 'admin/system/repair-media-urls', token)
|
||||||
|
|||||||
@@ -11,19 +11,28 @@ const DATE_PRESETS = [
|
|||||||
export default function FilterBar({ categories, tags, filters, onChange }) {
|
export default function FilterBar({ categories, tags, filters, onChange }) {
|
||||||
const set = key => val => onChange({ ...filters, [key]: val })
|
const set = key => val => onChange({ ...filters, [key]: val })
|
||||||
|
|
||||||
|
// Мультивыбор колледжей: filters.category — массив slug'ов
|
||||||
|
const selected = filters.category ?? []
|
||||||
|
const toggleCategory = slug => {
|
||||||
|
const next = selected.includes(slug)
|
||||||
|
? selected.filter(s => s !== slug)
|
||||||
|
: [...selected, slug]
|
||||||
|
set('category')(next)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="filter-bar">
|
<div className="filter-bar">
|
||||||
{/* Категории */}
|
{/* Категории (можно выбрать несколько) */}
|
||||||
<div className="filter-row">
|
<div className="filter-row">
|
||||||
<button
|
<button
|
||||||
className={`chip ${!filters.category ? 'chip--active' : 'chip--ghost'}`}
|
className={`chip ${selected.length === 0 ? 'chip--active' : 'chip--ghost'}`}
|
||||||
onClick={() => set('category')(null)}
|
onClick={() => set('category')([])}
|
||||||
>Все</button>
|
>Все</button>
|
||||||
{categories.map(c => (
|
{categories.map(c => (
|
||||||
<button
|
<button
|
||||||
key={c.id}
|
key={c.id}
|
||||||
className={`chip ${filters.category === c.slug ? 'chip--active' : 'chip--ghost'}`}
|
className={`chip ${selected.includes(c.slug) ? 'chip--active' : 'chip--ghost'}`}
|
||||||
onClick={() => set('category')(c.slug)}
|
onClick={() => toggleCategory(c.slug)}
|
||||||
>{c.name}</button>
|
>{c.name}</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import React, { useState, useEffect, useCallback, useRef } from 'react'
|
import React, { useState, useEffect, useCallback, useRef } from 'react'
|
||||||
|
import { useSearchParams } from 'react-router-dom'
|
||||||
import { useTheme } from '../hooks/useTheme'
|
import { useTheme } from '../hooks/useTheme'
|
||||||
import { getNews, getCategories, getTags, getArticle } from '../api/index'
|
import { getNews, getCategories, getTags, getArticle } from '../api/index'
|
||||||
import NewsCard from '../components/NewsCard'
|
import NewsCard from '../components/NewsCard'
|
||||||
@@ -19,6 +20,7 @@ function presetToDateFrom(preset) {
|
|||||||
|
|
||||||
export default function NewsFeed() {
|
export default function NewsFeed() {
|
||||||
const { dark, toggle } = useTheme()
|
const { dark, toggle } = useTheme()
|
||||||
|
const [searchParams, setSearchParams] = useSearchParams()
|
||||||
const [articles, setArticles] = useState([])
|
const [articles, setArticles] = useState([])
|
||||||
const [total, setTotal] = useState(0)
|
const [total, setTotal] = useState(0)
|
||||||
const [categories, setCategories] = useState([])
|
const [categories, setCategories] = useState([])
|
||||||
@@ -26,15 +28,27 @@ export default function NewsFeed() {
|
|||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [loadingMore, setLoadingMore] = useState(false)
|
const [loadingMore, setLoadingMore] = useState(false)
|
||||||
const [hasMore, setHasMore] = useState(false)
|
const [hasMore, setHasMore] = useState(false)
|
||||||
const [filters, setFilters] = useState({ category: null, tag: null, datePreset: '' })
|
// Начальное состояние фильтров читаем из URL — ссылка открывает ленту с этими колледжами
|
||||||
|
const [filters, setFilters] = useState(() => ({
|
||||||
|
// Чистим slug'и: CMS иногда дописывает свой путь (/page/...) в хвост ссылки —
|
||||||
|
// берём часть до первого «/» (в слагах слэша нет) и убираем дубли.
|
||||||
|
category: [...new Set(
|
||||||
|
(searchParams.get('category') || '')
|
||||||
|
.split(',')
|
||||||
|
.map(s => s.split('/')[0].trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
)],
|
||||||
|
tag: (searchParams.get('tag') || '').split('/')[0] || null,
|
||||||
|
datePreset: searchParams.get('period') || '',
|
||||||
|
}))
|
||||||
|
|
||||||
const offsetRef = useRef(0)
|
const offsetRef = useRef(0)
|
||||||
const busyRef = useRef(false)
|
const busyRef = useRef(false)
|
||||||
const sentinelRef = useRef(null)
|
const sentinelRef = useRef(null)
|
||||||
|
|
||||||
// Поиск с debounce
|
// Поиск с debounce (тоже инициализируется из URL)
|
||||||
const [searchInput, setSearchInput] = useState('')
|
const [searchInput, setSearchInput] = useState(() => searchParams.get('q') || '')
|
||||||
const [searchQuery, setSearchQuery] = useState('')
|
const [searchQuery, setSearchQuery] = useState(() => searchParams.get('q') || '')
|
||||||
const debounceRef = useRef(null)
|
const debounceRef = useRef(null)
|
||||||
|
|
||||||
const handleSearch = e => {
|
const handleSearch = e => {
|
||||||
@@ -60,7 +74,7 @@ export default function NewsFeed() {
|
|||||||
|
|
||||||
const buildParams = useCallback((offset) => {
|
const buildParams = useCallback((offset) => {
|
||||||
const params = { limit: PAGE_SIZE, offset }
|
const params = { limit: PAGE_SIZE, offset }
|
||||||
if (filters.category) params.category = filters.category
|
if (filters.category?.length) params.category = filters.category.join(',')
|
||||||
if (filters.tag) params.tag = filters.tag
|
if (filters.tag) params.tag = filters.tag
|
||||||
const df = presetToDateFrom(filters.datePreset)
|
const df = presetToDateFrom(filters.datePreset)
|
||||||
if (df) params.date_from = df
|
if (df) params.date_from = df
|
||||||
@@ -68,6 +82,16 @@ export default function NewsFeed() {
|
|||||||
return params
|
return params
|
||||||
}, [filters, searchQuery])
|
}, [filters, searchQuery])
|
||||||
|
|
||||||
|
// Синхронизируем фильтры/поиск в URL, чтобы адрес можно было скопировать и расшарить
|
||||||
|
useEffect(() => {
|
||||||
|
const p = {}
|
||||||
|
if (filters.category.length) p.category = filters.category.join(',')
|
||||||
|
if (filters.tag) p.tag = filters.tag
|
||||||
|
if (filters.datePreset) p.period = filters.datePreset
|
||||||
|
if (searchQuery) p.q = searchQuery
|
||||||
|
setSearchParams(p, { replace: true })
|
||||||
|
}, [filters, searchQuery, setSearchParams])
|
||||||
|
|
||||||
// Сброс и первая загрузка при смене фильтров/поиска
|
// Сброс и первая загрузка при смене фильтров/поиска
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let cancelled = false
|
let cancelled = false
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState, useEffect, useCallback } from 'react'
|
import React, { useState, useEffect, useCallback } from 'react'
|
||||||
import { useAuth } from '../../hooks/useAuth'
|
import { useAuth } from '../../hooks/useAuth'
|
||||||
import { adminSystemStatus } from '../../api/index'
|
import { adminSystemStatus, adminRepairMediaUrls } from '../../api/index'
|
||||||
import AdminLayout from '../../components/AdminLayout'
|
import AdminLayout from '../../components/AdminLayout'
|
||||||
import Loader from '../../components/Loader'
|
import Loader from '../../components/Loader'
|
||||||
|
|
||||||
@@ -90,6 +90,7 @@ export default function SystemStatus() {
|
|||||||
const [data, setData] = useState(null)
|
const [data, setData] = useState(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [lastUpdated, setLastUpdated] = useState(null)
|
const [lastUpdated, setLastUpdated] = useState(null)
|
||||||
|
const [repairState, setRepairState] = useState(null) // null | 'running' | result-object
|
||||||
|
|
||||||
const load = useCallback(async () => {
|
const load = useCallback(async () => {
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
@@ -106,6 +107,17 @@ export default function SystemStatus() {
|
|||||||
|
|
||||||
useEffect(() => { load() }, [load])
|
useEffect(() => { load() }, [load])
|
||||||
|
|
||||||
|
const runRepair = async () => {
|
||||||
|
if (!window.confirm('Обновить все MinIO URL в базе данных?\nЭто перезапишет cover_url и img-теги в контенте статей.')) return
|
||||||
|
setRepairState('running')
|
||||||
|
try {
|
||||||
|
const result = await adminRepairMediaUrls(token)
|
||||||
|
setRepairState(result)
|
||||||
|
} catch (e) {
|
||||||
|
setRepairState({ error: String(e) })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const allOk = data && Object.values(data).every(s => s.ok)
|
const allOk = data && Object.values(data).every(s => s.ok)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -127,10 +139,33 @@ export default function SystemStatus() {
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
<div style={{ display: 'flex', gap: '0.5rem', flexWrap: 'wrap' }}>
|
||||||
<button className="btn btn-ghost btn-sm" onClick={load} disabled={loading}>
|
<button className="btn btn-ghost btn-sm" onClick={load} disabled={loading}>
|
||||||
{loading ? 'Проверяю...' : '🔄 Обновить'}
|
{loading ? 'Проверяю...' : '🔄 Обновить'}
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
className="btn btn-sm"
|
||||||
|
style={{ background: 'var(--c-warning, #f59e0b)', color: '#fff', border: 'none' }}
|
||||||
|
onClick={runRepair}
|
||||||
|
disabled={repairState === 'running'}
|
||||||
|
>
|
||||||
|
{repairState === 'running' ? 'Исправляю...' : '🔧 Починить URL медиа'}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{repairState && repairState !== 'running' && (
|
||||||
|
<div style={{
|
||||||
|
background: repairState.error ? 'var(--c-danger-bg, #fee2e2)' : 'var(--c-success-bg, #d1fae5)',
|
||||||
|
color: repairState.error ? 'var(--c-danger, #991b1b)' : 'var(--c-success, #065f46)',
|
||||||
|
borderRadius: 8, padding: '0.75rem 1rem', marginBottom: '1rem', fontSize: '0.875rem',
|
||||||
|
}}>
|
||||||
|
{repairState.error
|
||||||
|
? `Ошибка: ${repairState.error}`
|
||||||
|
: `✅ Готово. Новый base: ${repairState.new_base} | cover_url: ${repairState.cover_url_fixed} | контент: ${repairState.content_fixed} | media: ${repairState.media_fixed}`
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{loading && !data ? <Loader /> : (
|
{loading && !data ? <Loader /> : (
|
||||||
<div style={{ display: 'grid', gap: '1rem', gridTemplateColumns: 'repeat(auto-fill, minmax(340px, 1fr))' }}>
|
<div style={{ display: 'grid', gap: '1rem', gridTemplateColumns: 'repeat(auto-fill, minmax(340px, 1fr))' }}>
|
||||||
|
|||||||
Reference in New Issue
Block a user