mz/video-gen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitee.com/wg123/video-gen

Browse Source
This commit is contained in:
GinHa
2026-06-29 13:51:32 +08:00
parent 25fa41f894 241bfd4aed
commit 3f376d63bf
23 changed files with 562 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video-gen-api/app/api/v1/auth.py
+4 -4
View File
@@ -308,10 +308,10 @@ async def change_password(
@router.get("/site-info")
async def get_site_info(db: AsyncSession = Depends(get_db)):
"""Public endpoint returning site name and logo."""
"""Public endpoint returning site name, logo, agreement and copyright info."""
result = await db.execute(
select(SystemConfig).where(SystemConfig.key.in_([
"site_name", "site_logo", "user_agreement_url", "privacy_policy_url"
"site_name", "site_logo", "user_agreement_privacy_url", "site_copyright"
]))
)
configs = result.scalars().all()
@@ -331,8 +331,8 @@ async def get_site_info(db: AsyncSession = Depends(get_db)):
return {
"site_name": info.get("site_name", "VideoGen.AI"),
"site_logo": to_full_url(info.get("site_logo")),
"user_agreement_url": to_full_url(info.get("user_agreement_url")),
"privacy_policy_url": to_full_url(info.get("privacy_policy_url")),
"user_agreement_privacy_url": to_full_url(info.get("user_agreement_privacy_url")),
"site_copyright": info.get("site_copyright", "© 2024 民众智创 版权所有"),
}
video-gen-api/app/api/v1/contact.py
+42 -27
View File
@@ -2,6 +2,7 @@ from datetime import datetime, timezone, timedelta
from fastapi import APIRouter, Depends, HTTPException, status
from sqlalchemy import func, select
from sqlalchemy.exc import IntegrityError
from sqlalchemy.ext.asyncio import AsyncSession
from app.dependencies import get_db, get_current_user
@@ -19,37 +20,48 @@ async def create_contact_request(
db: AsyncSession = Depends(get_db),
user: User = Depends(get_current_user),
):
today_start = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
today_end = today_start + timedelta(days=1)
today_str = datetime.now(timezone.utc).strftime("%Y-%m-%d")
count = await db.execute(
select(func.count(ContactRequest.id))
.where(ContactRequest.user_id == user.id)
.where(ContactRequest.created_at >= today_start)
.where(ContactRequest.created_at < today_end)
)
daily_count = count.scalar_one()
async with db.begin_nested():
user_result = await db.execute(
select(User).where(User.id == user.id).with_for_update().limit(1)
)
locked_user = user_result.scalar_one_or_none()
if not locked_user:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="用户不存在")
existing = await db.execute(
select(ContactRequest.id)
.where(ContactRequest.user_id == user.id)
.where(ContactRequest.submit_date == today_str)
.limit(1)
)
if existing.scalar_one_or_none():
raise HTTPException(
status_code=status.HTTP_429_TOO_MANY_REQUESTS,
detail="每个账号每天只能提交一次联系我们"
)
if daily_count >= 1:
try:
contact_request = ContactRequest(
id=generate_id(),
user_id=user.id,
phone=request.phone,
company_name=request.company_name,
industry=request.industry,
name=request.name,
message=request.message,
submit_date=today_str,
)
db.add(contact_request)
await db.commit()
except IntegrityError:
await db.rollback()
raise HTTPException(
status_code=status.HTTP_429_TOO_MANY_REQUESTS,
detail="每个账号每天只能提交一次联系我们"
)
contact_request = ContactRequest(
id=generate_id(),
user_id=user.id,
phone=request.phone,
company_name=request.company_name,
industry=request.industry,
name=request.name,
message=request.message,
)
db.add(contact_request)
await db.commit()
await db.refresh(contact_request)
return {"message": "提交成功，我们会尽快与您联系"}
@@ -64,17 +76,20 @@ async def get_contact_requests(
if not user.is_admin:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="无权限")
query = select(ContactRequest).order_by(ContactRequest.created_at.desc())
query = select(ContactRequest)
count_query = select(func.count(ContactRequest.id))
if is_handled is not None:
query = query.where(ContactRequest.is_handled == is_handled)
count_query = count_query.where(ContactRequest.is_handled == is_handled)
query = query.order_by(ContactRequest.created_at.desc())
offset = (page - 1) * page_size
result = await db.execute(query.offset(offset).limit(page_size))
items = result.scalars().all()
count_result = await db.execute(select(func.count(ContactRequest.id)))
total = count_result.scalar_one()
total = (await db.execute(count_query)).scalar_one()
return {"items": items, "total": total}
video-gen-api/app/api/v1/payments.py
+24 -22
View File
@@ -127,30 +127,32 @@ async def wechat_callback(request: Request, db: AsyncSession = Depends(get_db)):
signature = headers.get("wechatpay-signature", "")
serial_no = headers.get("wechatpay-serial", "")
# 安全要求：非mock模式下必须验证签名，配置缺失直接拒绝
if not public_key:
logger.error("WeChat platform public key not configured, cannot verify callback signature")
return {"code": "FAIL", "message": "Platform public key not configured"}
if not serial_no:
logger.error("Wechatpay-Serial header missing in callback")
return {"code": "FAIL", "message": "Missing Wechatpay-Serial header"}
if not timestamp or not nonce or not signature:
logger.error("WeChat callback missing required signature headers")
return {"code": "FAIL", "message": "Missing signature headers"}
# 验证签名：使用平台公钥验证
if public_key and serial_no:
try:
# 构造签名串：timestamp + "\n" + nonce + "\n" + body + "\n"
# 符合微信支付官方文档规范：https://pay.weixin.qq.com/doc/v3/merchant/4013053249
is_verified = rsa_verify(
timestamp=timestamp,
nonce=nonce,
body=body_str,
signature=signature,
public_key=load_public_key(public_key)
)
if not is_verified:
logger.warning(f"WeChat callback signature verification failed: serial={serial_no}")
raise HTTPException(status_code=400, detail="签名验证失败")
except Exception as e:
logger.warning(f"WeChat signature verification error: {e}, serial={serial_no}")
raise HTTPException(status_code=400, detail="签名验证失败")
else:
if not public_key:
logger.warning("WeChat platform public key not configured, skipping signature verification")
if not serial_no:
logger.warning("Wechatpay-Serial header missing, skipping signature verification")
try:
is_verified = rsa_verify(
timestamp=timestamp,
nonce=nonce,
body=body_str,
signature=signature,
public_key=load_public_key(public_key)
)
if not is_verified:
logger.warning(f"WeChat callback signature verification failed: serial={serial_no}")
return {"code": "FAIL", "message": "Signature verification failed"}
except Exception as e:
logger.warning(f"WeChat signature verification error: {e}, serial={serial_no}")
return {"code": "FAIL", "message": "Signature verification error"}
# 解密回调数据：使用 API v3 key
# 官方文档：https://pay.weixin.qq.com/doc/v3/merchant/4012071382
video-gen-api/app/main.py
+9 -4
View File
@@ -164,12 +164,12 @@ async def _seed_data():
configs = [
("site_name", "民众智创", "网站名称"),
("site_logo", "", "网站Logo URL"),
("site_copyright", "© 2024 民众智创 版权所有", "网站底部版权信息"),
("seo_title", "民众智创 - AI视频生成平台", "SEO标题"),
("seo_description", "专业的AI视频生成服务", "SEO描述"),
("seo_keywords", "AI视频,视频生成,人工智能", "SEO关键词"),
# Agreement configs
("user_agreement_url", "", "用户协议PDF"),
("privacy_policy_url", "", "隐私政策PDF"),
# Agreement config
("user_agreement_privacy_url", "", "用户协议及隐私政策PDF"),
# Payment configs
("payment_wechat_enabled", "false", "微信支付启用"),
("payment_wechat_mch_id", "", "微信商户号"),
@@ -188,12 +188,17 @@ async def _seed_data():
existing = await db.execute(
select(SystemConfig).where(SystemConfig.key == key).limit(1)
)
if not existing.scalar_one_or_none():
existing_config = existing.scalar_one_or_none()
if not existing_config:
db.add(
SystemConfig(
id=generate_id(), key=key, value=value, description=desc
)
)
elif not existing_config.description and desc:
# Update description if not set
existing_config.description = desc
db.add(existing_config)
# Seed video engine
existing_engine = await db.execute(
video-gen-api/app/models/contact_request.py
+9 -2
View File
@@ -1,4 +1,4 @@
from sqlalchemy import Boolean, ForeignKey, String, Text
from sqlalchemy import Boolean, ForeignKey, String, Text, UniqueConstraint, Index
from sqlalchemy.orm import Mapped, mapped_column
from app.models.base import Base, TimestampMixin
@@ -14,4 +14,11 @@ class ContactRequest(Base, TimestampMixin):
industry: Mapped[str] = mapped_column(String(64))
name: Mapped[str] = mapped_column(String(64))
message: Mapped[str | None] = mapped_column(Text, nullable=True)
is_handled: Mapped[bool] = mapped_column(Boolean, default=False)
is_handled: Mapped[bool] = mapped_column(Boolean, default=False)
submit_date: Mapped[str] = mapped_column(String(10), index=True)
__table_args__ = (
UniqueConstraint('user_id', 'submit_date', name='uq_contact_user_date'),
Index('idx_contact_handled_created', 'is_handled', 'created_at'),
Index('idx_contact_user_date_created', 'user_id', 'submit_date', 'created_at'),
)
video-gen-api/app/models/generation_record.py
+6 -1
View File
@@ -1,6 +1,6 @@
from datetime import datetime
from sqlalchemy import DateTime, ForeignKey, Integer, String, Text, Float
from sqlalchemy import DateTime, ForeignKey, Integer, String, Text, Float, Index
from sqlalchemy.orm import Mapped, mapped_column
from app.models.base import Base, TimestampMixin, SoftDeleteMixin
@@ -45,3 +45,8 @@ class GenerationRecord(Base, TimestampMixin, SoftDeleteMixin):
)
error_message: Mapped[str | None] = mapped_column(Text, nullable=True)
idempotency_key: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
__table_args__ = (
Index('idx_genrec_user_status_created', 'user_id', 'status', 'created_at'),
Index('idx_genrec_project_status', 'project_id', 'status'),
)
video-gen-api/app/models/menu_config.py
+9 -5
View File
@@ -1,4 +1,4 @@
from sqlalchemy import Boolean, Integer, String, ForeignKey
from sqlalchemy import Boolean, Integer, String, ForeignKey, Index
from sqlalchemy.orm import Mapped, mapped_column
from app.models.base import Base, TimestampMixin
@@ -13,7 +13,11 @@ class MenuConfig(Base, TimestampMixin):
icon: Mapped[str] = mapped_column(String(64), default="")
sort_order: Mapped[int] = mapped_column(Integer, default=0)
is_active: Mapped[bool] = mapped_column(Boolean, default=True)
parent_id: Mapped[str | None] = mapped_column(String(32), ForeignKey("menu_configs.id"), nullable=True)
menu_type: Mapped[str] = mapped_column(String(16), default="page") # page / group
menu_target: Mapped[str] = mapped_column(String(16), default="frontend") # frontend / admin / both
is_default: Mapped[bool] = mapped_column(Boolean, default=False) # default show for new users
parent_id: Mapped[str | None] = mapped_column(String(32), ForeignKey("menu_configs.id"), nullable=True, index=True)
menu_type: Mapped[str] = mapped_column(String(16), default="page")
menu_target: Mapped[str] = mapped_column(String(16), default="frontend")
is_default: Mapped[bool] = mapped_column(Boolean, default=False)
__table_args__ = (
Index('idx_menu_target_active_sort', 'menu_target', 'is_active', 'sort_order'),
)
video-gen-api/app/models/operation_log.py
+9 -4
View File
@@ -1,4 +1,4 @@
from sqlalchemy import Integer, String, Text
from sqlalchemy import Integer, String, Text, Index
from sqlalchemy.orm import Mapped, mapped_column
from app.models.base import Base, TimestampMixin
@@ -10,8 +10,13 @@ class OperationLog(Base, TimestampMixin):
id: Mapped[str] = mapped_column(String(32), primary_key=True)
user_id: Mapped[str] = mapped_column(String(32), index=True)
username: Mapped[str] = mapped_column(String(64))
action: Mapped[str] = mapped_column(String(128)) # e.g. "创建用户", "修改菜单"
method: Mapped[str] = mapped_column(String(10)) # POST/PUT/DELETE
action: Mapped[str] = mapped_column(String(128))
method: Mapped[str] = mapped_column(String(10))
path: Mapped[str] = mapped_column(String(256))
detail: Mapped[str | None] = mapped_column(Text, nullable=True) # JSON detail
detail: Mapped[str | None] = mapped_column(Text, nullable=True)
ip: Mapped[str | None] = mapped_column(String(64), nullable=True)
__table_args__ = (
Index('idx_oplog_user_created', 'user_id', 'created_at'),
Index('idx_oplog_created', 'created_at'),
)
video-gen-api/app/models/payment_order.py
+6 -2
View File
@@ -1,6 +1,6 @@
from datetime import datetime
from sqlalchemy import DateTime, Float, ForeignKey, Integer, String
from sqlalchemy import DateTime, Float, ForeignKey, Integer, String, Index
from sqlalchemy.orm import Mapped, mapped_column
from app.models.base import Base, TimestampMixin
@@ -22,9 +22,13 @@ class PaymentOrder(Base, TimestampMixin):
DateTime(timezone=True), nullable=True
)
trade_no: Mapped[str | None] = mapped_column(String(128), nullable=True)
# Refund fields
refund_trade_no: Mapped[str | None] = mapped_column(String(128), nullable=True)
refunded_at: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
refund_amount: Mapped[float | None] = mapped_column(Float, nullable=True)
__table_args__ = (
Index('idx_payorder_user_status_created', 'user_id', 'status', 'created_at'),
Index('idx_payorder_status_created', 'status', 'created_at'),
)
video-gen-api/app/models/upload_task.py
+6 -1
View File
@@ -1,4 +1,4 @@
from sqlalchemy import String, Text, Integer
from sqlalchemy import String, Text, Integer, Index
from sqlalchemy.orm import Mapped, mapped_column
from app.models.base import Base, TimestampMixin, SoftDeleteMixin
@@ -31,3 +31,8 @@ class UploadTask(Base, TimestampMixin, SoftDeleteMixin):
other_info: Mapped[str | None] = mapped_column(
String(500), nullable=True, comment="其他信息"
)
__table_args__ = (
Index('idx_upload_user_status_created', 'user_id', 'status', 'created_at'),
Index('idx_upload_oauth_status', 'oauth_id', 'status'),
)