liumangmang
6044b00685
- 上游 Key 命名改为 {prefix}-{upstream.id}-{safe_group_name}-{group_id}
- 唯一约束 (upstream_id, group_id, managed_prefix) 加 managed_prefix 列
- 上游检测成功时同步 Key 状态，远端已删/分组已删自动清理
- 重复分组导入跳过，目标网站已存在同名分组返回 exists
- 账号导入平台自动识别（auto/manual 模式）
- 全选可导入 Key 按钮 + 目标分组自动匹配
- 导入幂等：已导入过的 Key 校验远端账号，不存在则重建
- 新增同步接口 POST /sync-imported-upstream-keys
- account_exists() 通过拉取账号列表判断，避免 404 误判
- credentials.base_url 注入来源上游地址，避免 401
- 前端导入弹窗自动同步+刷新按钮+并发/优先级设置
- 新增 12 个测试覆盖同步、幂等、远端删除、校验失败路径
34 lines
1.9 KiB
Python
34 lines
1.9 KiB
Python
from datetime import datetime, timezone
|
|
from typing import Optional
|
|
|
|
from sqlalchemy import DateTime, ForeignKey, Integer, String, Text, UniqueConstraint
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
|
|
from app.database import Base
|
|
|
|
|
|
class UpstreamGeneratedKey(Base):
|
|
__tablename__ = "upstream_generated_keys"
|
|
|
|
id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
|
|
upstream_id: Mapped[int] = mapped_column(Integer, ForeignKey("upstreams.id", ondelete="CASCADE"), index=True)
|
|
group_id: Mapped[str] = mapped_column(String(255), nullable=False, index=True)
|
|
group_name: Mapped[str] = mapped_column(String(255), default="")
|
|
key_id: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
|
|
key_name: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
key_value: Mapped[str] = mapped_column(Text, nullable=False)
|
|
masked_key: Mapped[str] = mapped_column(String(255), default="")
|
|
raw_json: Mapped[str] = mapped_column(Text, default="{}")
|
|
managed_prefix: Mapped[Optional[str]] = mapped_column(String(64), nullable=True, index=True)
|
|
status: Mapped[str] = mapped_column(String(32), default="created")
|
|
error: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
|
|
imported_website_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("websites.id", ondelete="SET NULL"), nullable=True, index=True)
|
|
imported_account_id: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
|
|
imported_at: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, default=lambda: datetime.now(timezone.utc))
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime, default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
|
|
|
|
__table_args__ = (
|
|
UniqueConstraint("upstream_id", "group_id", "key_name", name="uq_upstream_group_key"),
|
|
)
|