Release v1.0.3

Author: AuuCoder

.env.example

@@ -77,10 +77,12 @@ STORAGE_BACKEND=json
 # FLARESOLVERR_LOG_LEVEL=info
 # TZ=Asia/Shanghai
 
-# Optional local iCloud Privacy Mail sidecar (`--profile local-icloud`)
-# sidecar 只在 Compose 内部网络监听 8787，不映射宿主机端口；本系统 provider 不需要 API Key。
+# Optional iCloud Privacy Mail sidecar (`--profile local-icloud`)
+# sidecar 容器内监听 8787；Warp 编排默认映射到宿主机 127.0.0.1:8788。
 # ICLOUD_PRIVACY_MAIL_API_KEY=replace_with_a_long_random_secret
-# ICLOUD_PRIVACY_MAIL_PUBLIC_BASE_URL=http://icloud-privacy-mail:8787
+# 返回给浏览器和外部调用方的邮箱 API 地址，必须从容器外可访问。
+# 本机 Warp Compose 默认映射到 8788；服务器请改为对外 HTTPS 地址。
+# ICLOUD_PRIVACY_MAIL_PUBLIC_BASE_URL=http://127.0.0.1:8788
 # ICLOUD_PRIVACY_MAIL_IMAGE=chatgpt2api/icloud-privacy-mail:2026.07.14.1
 # WARP 编排默认通过内部 Privoxy 请求 Apple；标准编排可按需填写外部 HTTP 代理。
 # ICLOUD_PRIVACY_MAIL_HTTP_PROXY=http://privoxy:8118

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.0.3 - 2026-07-18
+
++ [修复] 更新中心的最新版本与更新日志统一从 GitHub Releases 和仓库读取，不再依赖独立更新服务器，手动检查会强制刷新 GitHub 缓存。
++ [修复] Outlook 旧版 IMAP OAuth Token 自动兼容 Graph 权限差异，缓存不可用通道并重试瞬时 IMAP 超时，避免重复刷新触发 `AADSTS50196` 或误判 Token 失效。
++ [优化] ChatGPT 注册邮箱等待保留真实 provider 错误；CF 邮箱短窗口重发一次后自动切换其他已启用邮箱来源，避免任务长期卡在无邮件状态。
++ [优化] 注册配置全面改为自动保存，离开页面不再丢失邮箱、Checkout、Sub2API 和 OAuth 投递设置；启动任务前会等待最新修改保存完成。
++ [修复] Grok OAuth 同步到 Sub2API 时使用 Grok 平台字段并补齐 CLI OAuth 元数据与 SSO，远程投递错误继续执行敏感字段脱敏。
++ [修复] Pix 方案 3 固定执行 BR 原价校验、VN 优惠注入、BR 税区与零金额 PIX 校验，并始终在原 BR 出口执行 Approve 与轮询。
++ [文档] 补充 iCloud Privacy Mail 对外 API 地址和本机 `8788` 端口配置说明。
+
 ## 1.0.2 - 2026-07-17
 
 + [新增] Grok 4.5 OAuth 账号支持按配置独立投递到 Sub2API 和 CPA；凭据始终先保存到本地，远程失败不影响授权结果。

README.md

@@ -28,7 +28,7 @@ GPTGrok2API 是一个自托管的 GPT 与 Grok 统一网关，将已接入的订
 | 外部系统接入 | 支持从 Sub2API、远程 CPA、本地 CPA 和 Access Token 导入账号；服务器部署提供 `gptgrok2api` Docker 网络别名。 |
 | 管理控制台 | 提供概览、GPT/Grok 账号管理、Grok Runtime、iCloud 邮箱、注册任务、Checkout 任务、代理管理、日志、实时监控、图片管理、调试中心和系统设置。 |
 | 存储与备份 | 账号数据支持 JSON、SQLite、PostgreSQL 和 Git 后端；图片支持本地与 WebDAV；备份支持本地归档和 R2。 |
-| 运维与发布 | 支持 Docker Compose、WARP 编排、内置 sidecar、Nginx HTTPS、运行日志、指标趋势、健康检查和自有版本更新源。 |
+| 运维与发布 | 支持 Docker Compose、WARP 编排、内置 sidecar、Nginx HTTPS、运行日志、指标趋势、健康检查和 GitHub Releases 更新源。 |
 
 ## iCloud Privacy Mail 模块
 
@@ -252,23 +252,21 @@ curl https://pro.muyuai.top/v1/models \
 
 ## 版本更新
 
-控制台从部署的更新服务器读取更新源：
+控制台统一从 GitHub 读取最新版本和更新日志：
 
 ```text
-https://pro.muyuai.top/updates/VERSION
-https://pro.muyuai.top/updates/CHANGELOG.md
+https://api.github.com/repos/AuuCoder/gptGrok2api/releases
+https://raw.githubusercontent.com/AuuCoder/gptGrok2api/main/CHANGELOG.md
 ```
 
-GitHub 仅用于打开项目发布页，不作为控制台版本号和更新日志的读取源。发布新版本时需先更新本地 `VERSION`、`CHANGELOG.md`，再同步到该更新服务器。
-
 工作方式：
 
 1. 当前运行版本由本机 `/version` 返回。
-2. 最新版本从自有更新源 `https://pro.muyuai.top/updates/VERSION` 读取。
-3. 更新日志从 `https://pro.muyuai.top/updates/CHANGELOG.md` 读取。
-4. 控制台比较版本号并显示更新状态。
+2. 最新版本从 GitHub Releases API 读取。
+3. 更新日志从 GitHub 仓库 `main` 分支的 `CHANGELOG.md` 读取。
+4. 后端缓存 GitHub 查询结果，控制台比较版本号并显示更新状态。
 
-发布新版本时需要同步修改根目录 `VERSION` 和 `CHANGELOG.md`，然后重新构建并部署更新源服务器。
+发布新版本时只需更新根目录 `VERSION` 和 `CHANGELOG.md`，推送版本标签并等待 GitHub Actions 完成，不再维护独立更新服务器。
 
 ## 本地开发
 

VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

api/system.py

@@ -12,6 +12,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 from api.support import require_admin, require_identity, resolve_image_base_url
+from app.platform.update_check import get_latest_release_info
 from services.account_service import account_service
 from services.backup_service import BackupError, backup_service
 from services.config import config
@@ -559,6 +560,10 @@ async def auth_status(authorization: str | None = Header(default=None)):
     async def get_version():
         return {"version": app_version}
 
+    @router.get("/meta/update", include_in_schema=False)
+    async def get_update_meta(force: bool = Query(False)):
+        return await get_latest_release_info(force=force)
+
     @router.get("/updates/VERSION", response_class=PlainTextResponse)
     async def get_update_version():
         return PlainTextResponse(

api/system_test.py

@@ -0,0 +1,34 @@
+import unittest
+from unittest.mock import AsyncMock, patch
+
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+from api import system
+
+
+class SystemVersionRoutesTest(unittest.TestCase):
+    def setUp(self):
+        app = FastAPI()
+        app.include_router(system.create_router("1.0.3"))
+        self.client = TestClient(app)
+
+    def test_update_meta_uses_github_update_service_and_forwards_force(self):
+        payload = {
+            "current_version": "1.0.3",
+            "latest_version": "1.0.3",
+            "status": "ok",
+            "changelog": "# Changelog",
+        }
+        update_info = AsyncMock(return_value=payload)
+
+        with patch.object(system, "get_latest_release_info", new=update_info):
+            response = self.client.get("/meta/update?force=true")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), payload)
+        update_info.assert_awaited_once_with(force=True)
+
+
+if __name__ == "__main__":
+    unittest.main()

app/platform/update_check.py

@@ -4,6 +4,7 @@
 
 import asyncio
 from datetime import datetime, timezone
+import json
 import re
 import time
 from typing import Any
@@ -12,7 +13,8 @@
 
 from app.platform.meta import get_project_version
 
-_UPDATE_BASE_URL = "https://pro.muyuai.top/updates"
+_GITHUB_RELEASES_API_URL = "https://api.github.com/repos/AuuCoder/gptGrok2api/releases?per_page=20"
+_GITHUB_CHANGELOG_URL = "https://raw.githubusercontent.com/AuuCoder/gptGrok2api/main/CHANGELOG.md"
 _RELEASE_PAGE_URL = "https://github.com/AuuCoder/gptGrok2api/releases"
 _CACHE_TTL_SECONDS = 86400.0
 _ERROR_TTL_SECONDS = 300.0
@@ -72,12 +74,12 @@ def _select_latest_release(releases: list[dict[str, Any]]) -> dict[str, Any] | N
 
 def _normalize_error_message(value: str) -> str:
     text = str(value or "").strip()
-    if text.startswith("Update source query failed:"):
-        status_match = re.search(r"Update source query failed:\s*(\d{3})", text)
+    if text.startswith("GitHub update query failed:"):
+        status_match = re.search(r"GitHub update query failed:\s*(\d{3})", text)
         if status_match:
-            return f"Update source query failed ({status_match.group(1)})."
-        return "Update source query failed."
-    if text == "Update source returned an empty version":
+            return f"GitHub update query failed ({status_match.group(1)})."
+        return "GitHub update query failed."
+    if text == "GitHub Releases returned no published version":
         return text
     return text or "Update check failed."
 
@@ -87,9 +89,10 @@ def _build_payload(release: dict[str, Any] | None = None, error: str = "") -> di
     release = release or {}
     latest_version = _normalize_version(str(release.get("tag_name") or release.get("name") or ""))
     release_name = str(release.get("name") or "").strip()
-    release_url = str(release.get("html_url") or "").strip()
+    release_url = str(release.get("html_url") or _RELEASE_PAGE_URL).strip()
     published_at = str(release.get("published_at") or "").strip()
     release_notes = str(release.get("body") or "").strip()
+    changelog = str(release.get("changelog") or "").strip()
     has_remote = bool(release)
     return {
         "current_version": current_version,
@@ -98,41 +101,57 @@ def _build_payload(release: dict[str, Any] | None = None, error: str = "") -> di
         "release_url": release_url,
         "published_at": published_at,
         "release_notes": release_notes,
+        "changelog": changelog,
         "update_available": has_remote and bool(latest_version) and _is_newer(latest_version, current_version),
         "checked_at": _utc_now_iso(),
         "status": "error" if error else "ok",
         "error": _normalize_error_message(error),
     }
 
 
-async def _fetch_latest_release() -> dict[str, Any]:
-    timeout = aiohttp.ClientTimeout(total=10)
+async def _fetch_github_text(session: aiohttp.ClientSession, url: str, accept: str) -> str:
     headers = {
-        "Accept": "text/plain",
+        "Accept": accept,
+        "X-GitHub-Api-Version": "2022-11-28",
         "User-Agent": "gptgrok2api-update-check",
     }
+    async with session.get(url, headers=headers) as response:
+        content = (await response.text()).strip()
+        if response.status != 200:
+            raise RuntimeError(f"GitHub update query failed: {response.status} {content}".strip())
+        return content
+
+
+async def _fetch_github_releases(session: aiohttp.ClientSession) -> list[dict[str, Any]]:
+    content = await _fetch_github_text(
+        session,
+        _GITHUB_RELEASES_API_URL,
+        "application/vnd.github+json",
+    )
+    try:
+        payload = json.loads(content)
+    except ValueError as exc:
+        raise RuntimeError("GitHub Releases returned invalid JSON") from exc
+    if not isinstance(payload, list):
+        raise RuntimeError("GitHub Releases returned an invalid payload")
+    return [item for item in payload if isinstance(item, dict)]
+
+
+async def _fetch_github_changelog(session: aiohttp.ClientSession) -> str:
+    return await _fetch_github_text(session, _GITHUB_CHANGELOG_URL, "text/plain")
+
+
+async def _fetch_latest_release() -> dict[str, Any]:
+    timeout = aiohttp.ClientTimeout(total=10)
     async with aiohttp.ClientSession(timeout=timeout) as session:
-        async def fetch_text(filename: str) -> str:
-            url = f"{_UPDATE_BASE_URL}/{filename}"
-            async with session.get(url, headers=headers) as response:
-                content = (await response.text()).strip()
-                if response.status != 200:
-                    raise RuntimeError(f"Update source query failed: {response.status} {content}".strip())
-                return content
-
-        version, changelog = await asyncio.gather(
-            fetch_text("VERSION"),
-            fetch_text("CHANGELOG.md"),
+        releases, changelog = await asyncio.gather(
+            _fetch_github_releases(session),
+            _fetch_github_changelog(session),
         )
-        if not version:
-            raise RuntimeError("Update source returned an empty version")
-        return {
-            "tag_name": version,
-            "name": f"v{_normalize_version(version)}",
-            "html_url": _RELEASE_PAGE_URL,
-            "published_at": "",
-            "body": changelog,
-        }
+    latest = _select_latest_release(releases)
+    if latest is None:
+        raise RuntimeError("GitHub Releases returned no published version")
+    return {**latest, "changelog": changelog}
 
 
 async def get_latest_release_info(force: bool = False) -> dict[str, Any]:

app/platform/update_check_test.py

@@ -0,0 +1,60 @@
+import unittest
+from unittest.mock import AsyncMock, patch
+
+from app.platform import update_check
+
+
+class UpdateCheckTest(unittest.IsolatedAsyncioTestCase):
+    def test_select_latest_release_uses_version_order_and_skips_drafts(self):
+        releases = [
+            {"tag_name": "v1.9.9", "draft": False},
+            {"tag_name": "v2.0.0", "draft": True},
+            {"tag_name": "v1.10.0", "draft": False},
+            {"tag_name": "nightly", "draft": False},
+        ]
+
+        selected = update_check._select_latest_release(releases)
+
+        self.assertIsNotNone(selected)
+        self.assertEqual(selected["tag_name"], "v1.10.0")
+
+    def test_build_payload_exposes_github_changelog(self):
+        release = {
+            "tag_name": "v1.0.3",
+            "name": "v1.0.3",
+            "html_url": "https://github.com/AuuCoder/gptGrok2api/releases/tag/v1.0.3",
+            "published_at": "2026-07-18T11:31:23Z",
+            "body": "release notes",
+            "changelog": "# Changelog\n\n## 1.0.3",
+        }
+
+        with patch.object(update_check, "get_project_version", return_value="1.0.2"):
+            payload = update_check._build_payload(release=release)
+
+        self.assertEqual(payload["current_version"], "1.0.2")
+        self.assertEqual(payload["latest_version"], "1.0.3")
+        self.assertEqual(payload["changelog"], release["changelog"])
+        self.assertTrue(payload["update_available"])
+
+    async def test_fetch_latest_release_combines_github_release_and_changelog(self):
+        releases = [
+            {"tag_name": "v1.0.2", "draft": False},
+            {"tag_name": "v1.0.3", "draft": False, "body": "notes"},
+        ]
+        with patch.object(
+            update_check,
+            "_fetch_github_releases",
+            new=AsyncMock(return_value=releases),
+        ), patch.object(
+            update_check,
+            "_fetch_github_changelog",
+            new=AsyncMock(return_value="# Changelog"),
+        ):
+            release = await update_check._fetch_latest_release()
+
+        self.assertEqual(release["tag_name"], "v1.0.3")
+        self.assertEqual(release["changelog"], "# Changelog")
+
+
+if __name__ == "__main__":
+    unittest.main()

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chatgpt2api"
-version = "1.0.2"
+version = "1.0.3"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"