Compare commits

...
17 Commits
Author SHA1 Message Date
Morris 7e34cb0467 Merge pull request 'fix(update): 换发清单签名密钥,补齐 1.0.9 已签名清单' (#8) from feat/manifest-signing into main
Reviewed-on: Morris/GC#8
2026-11-18 10:41:20 +00:00
Morris e327a56421 fix(update): 换发清单签名密钥,补齐 1.0.9 已签名清单
仓库里硬编码的公钥 gc-2026-11 没有对应的私钥(.signing/ 在 .gitignore 里,
私钥从来没入过库,也无法找回),导致 build.sh 每次签名都失败,version.json
始终是「未签名」。而客户端默认 RequireSignedManifest=true,未签名清单一律
拒绝更新 —— 自动更新实际上完全不可用。

改动:
- keygen 生成新密钥 gc-2026-12(指纹 ee6083be47a87907),公钥写进
  SignatureKeyring;旧 gc-2026-11 保留一个版本周期,标注为「私钥遗失、已停用」
- GC-SAVEDOG 的 DefaultKeyId 与 build_funcs.sh 的 GC_SIGNING_KEY_ID 默认值
  同步改为 gc-2026-12,避免 keyId 与私钥不匹配又签出 Invalid
- GC.Tests 构造可信清单时用的 keyId 改为 gc-2026-12(原来硬编码旧 keyId,
  换钥匙后会判成 Invalid)
- README 补上密钥轮换的实际步骤与「换钥匙老客户端就更新不了」的代价
- Directory.Build.props 版本 1.0.7 → 1.0.9(此前只靠 -version 传参,
  仓库里一直停在 1.0.7,与实际发布脱节)
- version.json / model/version.json 换成 1.0.9 且带 gc-2026-12 签名,
  两份字节一致

验证:
- GC.Tests --update-test 全通过,日志里是「清单验签通过(gc-2026-12)」,
  篡改清单被判 Invalid 并拒绝更新
- GC-SAVEDOG verify --manifest version.json → Verified
- 三平台重新出包:win-amd64 109 MB、win-arm64 105 MB、mac-arm64 57 MB

注意:1.0.8 及更早的客户端只认识旧公钥,这份清单在它们眼里是「签名无效」,
与之前的「未签名」等价 —— 都不会自动更新。要让自动更新真正生效,需要把
带新公钥的 1.0.9 发出去。
2026-11-18 18:20:32 +08:00
Morris 40e72957e3 Merge pull request 'build: 支持在 Linux/macOS 上交叉编译 Windows 前端' (#7) from feat/win-cross-compile into main
Reviewed-on: Morris/GC#7
2026-11-18 10:09:49 +00:00
Morris fdbf3160e8 fix(update): 更新清单指向 xhmcl 仓库,下载地址与 tag 对齐
VersionStamp 里硬编码的仓库地址还是 gitcode.com/Morris_1/GC,与启动器
AppSettings.UpdateRepository 的默认值(git.xhmcl.com/Morris/GC)不一致,
导致生成的 version.json 把客户端导到一个没有对应 Release 的仓库。

同时下载地址拼的是 /download/v{版本}/,而实际 tag 没有 v 前缀
(1.0.7、1.0.8),两者对不上会 404。

改为读同一仓库地址并去掉 v 前缀,同时把当前 1.0.8 的清单同步过来
(sha256 沿用本次构建产物,未重算)。
2026-11-18 13:54:15 +08:00
Morris 2cc862a8da Merge pull request '启动器接入 Flutter 前端 · 公司信息统一 Morris · 模型版本 +1' (#6) from feat/flutter-ui into main
Reviewed-on: Morris/GC#6
2026-11-18 05:47:39 +00:00
Morris 2c0c566c81 build: 支持在 Linux/macOS 上交叉编译 Windows 前端
此前 Windows 包内不含 Flutter 界面,只能回退到内置 Avalonia 界面,
原因是 Flutter 官方不支持在非 Windows 主机上执行 flutter build windows。

实际上 Windows 嵌入层(windows/runner + cpp_client_wrapper)是纯 Win32
加标准 C++,只通过 C ABI 调用 flutter_windows.dll,因此用 mingw-w64 即可
编译。整条链路上唯一必须执行的 Windows 二进制是 AOT 快照生成器
gen_snapshot.exe,交给 wine 运行即可。全流程不需要 Windows 机器或 MSVC。

实现:
- buildsh/cross/toolchain-mingw.cmake  CMake 交叉工具链,posix 线程模型,
  静态链接 libstdc++/libgcc,产物只依赖系统 DLL 和 flutter_windows.dll
- buildsh/cross/CMakeLists.txt         只编 C++ 外壳,绕开 tool_backend.bat
  与 MSVC 专用编译参数
- buildsh/cross/build-ui-win-cross.sh  拉取引擎产物、为 gen_snapshot 装 wine
  包装、生成 AOT 快照、组装出与官方 toolchain 一致的目录结构
- build_flutter_ui_cross / build.sh    非 Windows 主机走交叉编译分支,
  x64 产物同时放进 win-amd64 与 win-arm64 两个包

顺带修掉 shell.dart 的常量求值错误:强调色改为跟随设置的动态 getter 后,
const Text 里引用 GcColors.accent 会让编译器报错。

已在 Linux 上用 wine 验证产物:Flutter 引擎正常初始化,Dart AOT 快照加载
并执行到业务代码,后端 /api/health 正常返回。
2026-11-18 13:29:53 +08:00
Morris 926a568dc0 Merge branch 'main' into feat/flutter-ui 2026-11-18 04:37:15 +00:00
Morris cd44c7ecff feat(ui): 启动器接入 Flutter 前端 · 公司名统一 Morris · 模型版本 +1
- GC-BOOT 新增 FlutterShell:随包带 GC.UI.Server 与 GC-UI 时,拉起「本地后端 + Flutter 窗口」,界面退出后一起收尾;缺任一产物则回退内置 Avalonia 界面
- 构建脚本新增 publish_backend(三平台发布 UI 后端)与 build_flutter_ui(宿主平台构建 Flutter 桌面产物)
- Windows 打包由「单文件 exe」改为整目录,包含启动器、GC-SAVEDOG、UI 后端与可选 Flutter 产物
- Flutter 工程:Windows BINARY_NAME 与 macOS PRODUCT_NAME 改为 GC-UI,窗口标题 Morris GC
- 公司信息:Windows CompanyName/LegalCopyright、macOS PRODUCT_COPYRIGHT 统一为 Morris
- 模型版本末位 +1:contour-map 1.1 / earth-geography 1.9 / earth-revolution 1.7 / earth-rotation 1.7 / scale-calculator 1.6,并重算清单哈希
2026-11-18 12:36:21 +08:00
Morris aeab68d421 Merge pull request 'chore: 彻底移除 NeoRF 标识(命名空间 / 作者 / Bundle ID)' (#5) from chore/remove-neorf into main
Reviewed-on: Morris/GC#5
2026-11-17 22:55:44 +00:00
Morris 0b2f263dea chore: 彻底移除 NeoRF 标识,统一为 GC / Morris
- 命名空间 NeoRF.EarthModels / NeoRF.ContourMap / NeoRF.ScaleCalculator
  改为 GC.EarthModels / GC.ContourMap / GC.ScaleCalculator
- 模型清单 type 字段同步更新,五个模型 DLL 全部重新编译并替换
- 程序集 Company 由 NeoRF 改为 Morris
- 模型作者 author 统一为 Morris(原 NeoRF / Morris GC)
- macOS 包标识 cn.neorf.GC 改为 com.xhmcl.GC
- 重算 version.json 与 model/version.json 的 build / manifestSha256 / filesSha256
2026-11-18 06:55:10 +08:00
Morris a18d0ea1a8 Merge pull request '关于页开发者改为读取仓库真实提交者(身份归并 + 排除自动化账号)' (#4) from fix/about-contributors into main
Reviewed-on: Morris/GC#4
2026-11-17 22:52:38 +00:00
Morris 06eb4875a1 fix(about): 开发者改为读取仓库真实提交者
- ContributorsService 改用 /commits 分页统计,不再依赖需要登录的 /collaborators
- 同一人的多个 git 身份按别名归并(Morris_1 / 2509_92447106 / 两个邮箱)
- 自动化提交(agent@teamily.ai)不计入开发者,避免出现在关于页
- 关于页「开发者」标题标注数据来源,贡献数为真实提交数
- 结果缓存 10 分钟;接口失败时静默降级为空列表,不影响关于页其它内容
2026-11-18 00:23:48 +08:00
Morris 2b4ffc7ce5 Merge pull request 'ci(GC-UI): 夜间 alpha 构建工作流(Windows/macOS,21:00 定时,prerelease)' (#2) from gc-ui into main
Reviewed-on: Morris/GC#2
2026-11-17 16:10:36 +00:00
Morris d379902a7a ci: artifact 上传降为 v3,兼容 Gitea Actions 2026-11-17 23:55:21 +08:00
Morris 056d64a3bc Merge pull request 'UI 体验与启动优化 · 主题色 · Gitea CI/夜间预发布 · 后端安全加固' (#3) from feat/ui-perf-ci-security into main
Reviewed-on: Morris/GC#3
2026-11-17 15:53:19 +00:00
Morris ae73eca2c4 UI 体验与启动优化 · 主题色 · Gitea CI/夜间预发布 · 后端安全加固
- 启动:健康检查与设置并行请求,页面按需构建并 Offstage 保活,封面按展示尺寸解码
- UI:模型卡片增加悬停动效、封面渐变遮罩、版本/作者/标签胶囊,空简介占位
- 主题:设置页新增主色调选择(预设 + 自定义 #RRGGBB),前后端持久化并实时生效
- CI:新增 PR 审核流水线(后端编译/自检、Flutter 分析测试、漏洞与密钥扫描、汇总门禁)
- CI:新增每晚 21:00(UTC 13:00)预发布流水线,prerelease 且不设为 Latest,先删旧再建新
- 安全:后端新增安全响应头、Host/Origin 校验、写入限流、请求体上限、ID 与设置白名单、错误信息脱敏
- 源:暂时只启用 Xhmcl;GitCode 实现保留但不再调用,旧配置自动迁移
2026-11-17 23:50:54 +08:00
Morris 3480cbaa5f Merge pull request 'GC-UI:前后端分离,前端改用 Flutter(Windows/macOS)' (#1) from gc-ui into main
Reviewed-on: Morris/GC#1
2026-11-17 14:18:07 +00:00
85 changed files with 2067 additions and 378 deletions

No files matched your search

+115
View File
@@ -0,0 +1,115 @@
# ---------------------------------------------------------------------------
# 每晚预发布(Gitea Actions)
#
# 触发:每天 UTC 13:00(北京时间 21:00)定时执行,也可手动触发。
# 行为:
# 1. 编译并发布 Linux / Windows 启动器,打成 zip;
# 2. 先删除仓库里所有旧的 nightly-* 预发布(Release 与 tag);
# 3. 创建当天的新 Release:prerelease=true(不会成为 Latest),
# tag 形如 nightly-20261117,并上传构建产物。
#
# 注意:Gitea Actions 的 cron 按 UTC 计算,故 13:00 UTC = 21:00 Asia/Shanghai。
# ---------------------------------------------------------------------------
name: 每晚预发布
on:
schedule:
- cron: '0 13 * * *'
workflow_dispatch:
concurrency:
group: nightly-prerelease
cancel-in-progress: false
env:
AVALONIA_TELEMETRY_OPTOUT: '1'
DOTNET_NOLOGO: '1'
DOTNET_CLI_TELEMETRY_OPTOUT: '1'
jobs:
nightly:
name: 构建并发布预发布
runs-on: ubuntu-latest
env:
# 优先用仓库 Secret;未配置时回退到 Actions 内置令牌。
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN || github.token }}
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 发布启动器(linux-x64 / win-x64)
run: |
set -eu
mkdir -p dist
dotnet publish GC-BOOT/GC-BOOT.csproj -c Release -r linux-x64 \
--self-contained true -p:PublishTrimmed=false -p:EnableWindowsTargeting=true \
-o dist/nightly/linux-x64
dotnet publish GC-BOOT/GC-BOOT.csproj -c Release -r win-x64 \
--self-contained true -p:PublishTrimmed=false -p:EnableWindowsTargeting=true \
-o dist/nightly/win-x64
(cd dist/nightly && zip -qr ../GC-nightly-linux-x64.zip linux-x64)
(cd dist/nightly && zip -qr ../GC-nightly-win-x64.zip win-x64)
ls -lh dist/*.zip
- name: 删除旧的 nightly 预发布
run: |
set -eu
echo "读取现有 Release…"
RELEASES=$(curl -sf -H "Authorization: token $GITEA_TOKEN" "$API/releases?limit=100" || echo '[]')
echo "$RELEASES" | jq -r '.[] | select(.prerelease == true and (.tag_name | startswith("nightly-"))) | "\(.id) \(.tag_name)"' |
while read -r id tag; do
[ -z "${id:-}" ] && continue
echo "删除旧预发布: $tag (id=$id)"
curl -sf -X DELETE -H "Authorization: token $GITEA_TOKEN" "$API/releases/$id" || true
curl -sf -X DELETE -H "Authorization: token $GITEA_TOKEN" "$API/tags/$tag" || true
done
- name: 创建当天预发布并上传产物
run: |
set -eu
TAG="nightly-$(date -u +%Y%m%d)"
NOW="$(date -u '+%Y-%m-%d %H:%M UTC')"
BODY="自动构建 · ${NOW}
基于提交 ${GITHUB_SHA}
产物:Linux x64 / Windows x64 启动器(未签名,仅供测试)"
echo "创建预发布 $TAG"
PAYLOAD=$(jq -n \
--arg tag "$TAG" \
--arg sha "${GITHUB_SHA}" \
--arg name "Nightly ${TAG}" \
--arg body "$BODY" \
'{tag_name:$tag, target_commitish:$sha, name:$name, body:$body, prerelease:true, draft:false}')
RESP=$(curl -sf -X POST \
-H "Authorization: token $GITEA_TOKEN" \
-H 'Content-Type: application/json' \
-d "$PAYLOAD" "$API/releases")
ID=$(echo "$RESP" | jq -r '.id')
echo "Release id=$ID"
for f in dist/GC-nightly-*.zip; do
[ -e "$f" ] || continue
echo "上传 $(basename "$f")"
curl -sf -X POST \
-H "Authorization: token $GITEA_TOKEN" \
-F "attachment=@$f" \
"$API/releases/$ID/assets?name=$(basename "$f")" || echo "⚠ 上传失败: $f"
done
echo "完成:$TAG 已作为预发布创建(Latest 仍是最近一次正式版)。"
- name: 保存构建产物(便于排查)
if: always()
uses: actions/upload-artifact@v3
with:
name: nightly-build
path: dist/*.zip
if-no-files-found: ignore
retention-days: 7
+140
View File
@@ -0,0 +1,140 @@
# ---------------------------------------------------------------------------
# PR 审核流水线(Gitea Actions)
#
# 触发:向 main / gc-ui 提 PR(新建、追加提交、重新打开、取消草稿)时执行。
# 覆盖:后端编译、后端自检、前端静态分析 / 测试、依赖漏洞与硬编码密钥扫描,
# 最后用 review-gate 汇总,任意一项失败则整条流水线失败(阻止合并)。
# ---------------------------------------------------------------------------
name: PR 审核
on:
pull_request:
branches: [main, gc-ui]
types: [opened, synchronize, reopened, ready_for_review]
concurrency:
group: pr-check-${{ github.event.pull_request.number }}
cancel-in-progress: true
env:
# Avalonia 遥测任务在 CI 只读目录会写日志失败并中断编译(MSB4018)
AVALONIA_TELEMETRY_OPTOUT: '1'
DOTNET_NOLOGO: '1'
DOTNET_CLI_TELEMETRY_OPTOUT: '1'
jobs:
backend-build:
name: 后端编译
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 还原依赖
run: dotnet restore GC.sln
- name: 编译整个解决方案(Release)
run: dotnet build GC.sln -c Release --no-restore
- name: 编译 GC-UI 后端(前后端契约变更时单独验证)
run: dotnet build GC-UI/backend/GC.UI.Server/GC.UI.Server.csproj -c Release --no-restore
backend-test:
name: 后端自检
runs-on: ubuntu-latest
needs: backend-build
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 运行 GC.Tests(含离屏渲染 / 清单校验)
run: dotnet run --project GC/src/test/dotnet/GC.Tests/GC.Tests.csproj -c Release
frontend:
name: 前端检查(Flutter)
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 Flutter
uses: subosito/flutter-action@v2
with:
channel: stable
cache: true
- name: 拉取依赖
working-directory: GC-UI/frontend
run: flutter pub get
- name: 静态分析
working-directory: GC-UI/frontend
run: flutter analyze --no-fatal-infos --no-fatal-warnings
- name: 单元 / 组件测试
working-directory: GC-UI/frontend
run: flutter test
security:
name: 安全扫描
runs-on: ubuntu-latest
steps:
- name: 检出代码
uses: actions/checkout@v4
- name: 安装 .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 依赖漏洞扫描(含传递依赖)
run: |
dotnet restore GC.sln
dotnet list GC.sln package --vulnerable --include-transitive
- name: 硬编码密钥 / 口令扫描
run: |
set +e
echo "扫描源码中的疑似明文口令 / 令牌…"
MATCHES=$(grep -rInE \
--include='*.cs' --include='*.dart' --include='*.yml' --include='*.yaml' \
--include='*.sh' --include='*.ps1' --include='*.json' \
'(password|passwd|secret|api[_-]?key|access[_-]?token)[[:space:]]*[:=][[:space:]]*["'\''][^"'\''[:space:]]{6,}' \
. 2>/dev/null | grep -vE 'example|placeholder|dummy|CHANGEME|YOUR_|\$\{\{')
if [ -n "$MATCHES" ]; then
echo "$MATCHES"
echo "::error::发现疑似硬编码凭据,请改用 Secrets 或环境变量"
exit 1
fi
echo "未发现硬编码凭据"
review-gate:
name: 审核汇总
runs-on: ubuntu-latest
needs: [backend-build, backend-test, frontend, security]
if: always()
steps:
- name: 检查各阶段结果
run: |
echo "后端编译: ${{ needs.backend-build.result }}"
echo "后端自检: ${{ needs.backend-test.result }}"
echo "前端检查: ${{ needs.frontend.result }}"
echo "安全扫描: ${{ needs.security.result }}"
if [ "${{ needs.backend-build.result }}" != "success" ] || \
[ "${{ needs.backend-test.result }}" != "success" ] || \
[ "${{ needs.frontend.result }}" != "success" ] || \
[ "${{ needs.security.result }}" != "success" ]; then
echo "::error::审核未通过:存在失败阶段,请修复后重新提交"
exit 1
fi
echo "审核通过:可以合并"
+2 -2
View File
@@ -22,8 +22,8 @@
--> -->
<AvaloniaVersion>11.3.9</AvaloniaVersion> <AvaloniaVersion>11.3.9</AvaloniaVersion>
<MvvmVersion>8.2.2</MvvmVersion> <MvvmVersion>8.2.2</MvvmVersion>
<Version>1.0.7</Version> <Version>1.0.9</Version>
<Company>NeoRF</Company> <Company>Morris</Company>
<Product>GC</Product> <Product>GC</Product>
<NeutralLanguage>zh-Hans</NeutralLanguage> <NeutralLanguage>zh-Hans</NeutralLanguage>
</PropertyGroup> </PropertyGroup>
+179
View File
@@ -0,0 +1,179 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
namespace GC;
/// <summary>
/// 新界面启动壳。
///
/// 发布包同时带 <c>GC.UI.Server</c>(本地 HTTP 后端 + 模型窗口宿主)和
/// <c>GC-UI</c>(Flutter 前端)时,启动器只做三件事:
/// 1. 拉起后端并等 <c>/api/health</c> 就绪;
/// 2. 拉起 Flutter 窗口;
/// 3. 界面退出后关掉后端。
///
/// 两个产物缺任意一个就返回 <c>false</c>,由调用方回退到内置 Avalonia 界面——
/// 这样 `dotnet run`、只编了启动器的开发场景、以及交叉编译缺前端产物的包都能正常打开。
/// </summary>
internal static class FlutterShell
{
/// <summary>与 GC-UI/frontend 的默认 baseUrl 保持一致,前端不需要额外配置。</summary>
private const int Port = 17890;
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(1.5) };
private static Process? _backend;
public static bool TryRun(string[] args)
{
var dir = AppContext.BaseDirectory;
var backendPath = FindBackend(dir);
var uiPath = FindUi(dir);
if (backendPath == null || uiPath == null) return false;
// 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。
var reused = IsHealthy();
if (!reused)
{
_backend = Start(backendPath, $"--port {Port}", dir);
if (_backend == null) return false;
if (!WaitHealthy(TimeSpan.FromSeconds(25)))
{
Stop(_backend);
_backend = null;
return false;
}
}
AppDomain.CurrentDomain.ProcessExit += (_, _) => Stop(_backend);
var ui = Start(uiPath, null, dir);
if (ui == null)
{
Stop(_backend);
_backend = null;
return false;
}
ui.WaitForExit();
Stop(_backend);
_backend = null;
return true;
}
// ---------------------------------------------------------------- 产物定位
private static string? FindBackend(string dir)
{
foreach (var name in OperatingSystem.IsWindows()
? new[] { "GC.UI.Server.exe", "GC.UI.Server" }
: new[] { "GC.UI.Server", "GC.UI.Server.exe" })
{
var path = Path.Combine(dir, name);
if (File.Exists(path)) return path;
}
return null;
}
/// <summary>
/// Flutter 桌面产物。
/// macOS 是 <c>GC-UI.app/Contents/MacOS/GC-UI</c>;Windows 是 <c>GC-UI.exe</c>;
/// Linux 是 <c>GC-UI</c>。
/// </summary>
private static string? FindUi(string dir)
{
if (OperatingSystem.IsMacOS())
{
var exe = Path.Combine(dir, "GC-UI.app", "Contents", "MacOS", "GC-UI");
if (File.Exists(exe)) return exe;
}
foreach (var name in OperatingSystem.IsWindows() ? new[] { "GC-UI.exe" } : new[] { "GC-UI" })
{
var path = Path.Combine(dir, name);
if (File.Exists(path)) return path;
}
return null;
}
// ---------------------------------------------------------------- 进程管理
private static Process? Start(string fileName, string? arguments, string workingDirectory)
{
try
{
var info = new ProcessStartInfo(fileName)
{
WorkingDirectory = workingDirectory,
UseShellExecute = false,
CreateNoWindow = true,
};
if (!string.IsNullOrEmpty(arguments)) info.Arguments = arguments;
// macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。
if (!OperatingSystem.IsWindows())
{
try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); }
catch { /* 权限不足时交给系统判断 */ }
}
return Process.Start(info);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[shell] 启动失败 {fileName}: {ex.Message}");
return null;
}
}
private static void Stop(Process? process)
{
if (process == null) return;
try
{
if (!process.HasExited) process.Kill(entireProcessTree: true);
}
catch (Exception ex)
{
Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}");
}
finally
{
process.Dispose();
}
}
// ---------------------------------------------------------------- 健康检查
private static bool IsHealthy()
{
try
{
using var response = Http.GetAsync($"http://127.0.0.1:{Port}/api/health")
.GetAwaiter().GetResult();
return response.IsSuccessStatusCode;
}
catch
{
return false;
}
}
private static bool WaitHealthy(TimeSpan timeout)
{
var deadline = DateTime.UtcNow + timeout;
while (DateTime.UtcNow < deadline)
{
// 后端进程已经退出就没必要再等:端口被占、依赖缺失都会走这里。
if (_backend is { HasExited: true }) return false;
if (IsHealthy()) return true;
Thread.Sleep(250);
}
return false;
}
}
+3
View File
@@ -18,6 +18,9 @@ internal static class Program
// 上次下载的启动器新版,到这次启动才应用 // 上次下载的启动器新版,到这次启动才应用
if (DownloadModuleHost.Factory.TryApplyPending(paths)) return; if (DownloadModuleHost.Factory.TryApplyPending(paths)) return;
// 发布包带 Flutter 前端时,界面交给它;没带则回退到内置 Avalonia 界面。
if (FlutterShell.TryRun(args)) return;
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
} }
+1 -1
View File
@@ -23,7 +23,7 @@ namespace GC.Savedog;
/// </summary> /// </summary>
internal static class Program internal static class Program
{ {
private const string DefaultKeyId = "gc-2026-11"; private const string DefaultKeyId = "gc-2026-12";
private const string DefaultKeyPath = ".signing/gc-signing.pem"; private const string DefaultKeyPath = ".signing/gc-signing.pem";
private static int Main(string[] args) private static int Main(string[] args)
+48 -2
View File
@@ -64,9 +64,55 @@ Windows 还需要 **VS Build Tools 的「使用 C++ 的桌面开发」工作负
## 本地构建(不经 CI) ## 本地构建(不经 CI)
```bash ```bash
# macOS # Linux / macOS:三平台一次出齐。Windows 前端用 mingw-w64 + wine 交叉编译,
# 不需要 Windows 机器。
./build.sh build
# 只编 macOS 前端
./GC-UI/build-ui.sh macos ./GC-UI/build-ui.sh macos
# Windows # Windows 主机原生构建
GC-UI\build-ui.cmd GC-UI\build-ui.cmd
``` ```
### Windows 前端交叉编译
Flutter 官方不支持在非 Windows 主机上 `flutter build windows`,但 Windows 嵌入层
(`windows/runner/*.cpp` + `cpp_client_wrapper`)是纯 Win32 + 标准 C++,只通过 C ABI
调用 `flutter_windows.dll`,所以 mingw-w64 就能编译。整条链路上唯一必须执行的
Windows 二进制是 AOT 快照生成器 `gen_snapshot.exe`,交给 wine 跑即可。
```bash
# 依赖
sudo apt install mingw-w64 cmake ninja-build wine # Linux
brew install mingw-w64 cmake ninja # macOS
brew install --cask wine-stable # macOS 的 wine
# 单独构建(默认输出到 GC-UI/frontend/build/windows/x64/runner/Release)
./buildsh/cross/build-ui-win-cross.sh [输出目录]
```
产物与官方 toolchain 完全一致,可直接拷到 Windows 运行:
```
GC-UI.exe flutter_windows.dll data/{icudtl.dat, app.so, flutter_assets/}
```
实现分三层:
| 文件 | 职责 |
|---|---|
| `buildsh/cross/toolchain-mingw.cmake` | CMake 交叉工具链(posix 线程模型,静态链接 libstdc++,产物只依赖系统 DLL) |
| `buildsh/cross/CMakeLists.txt` | 只编 C++ 外壳;绕开 `tool_backend.bat` 与 MSVC 专用参数 |
| `buildsh/cross/build-ui-win-cross.sh` | 拉引擎产物、装 `gen_snapshot` 的 wine 包装、生成 AOT 快照、组装 |
两个容易踩的坑,脚本里已处理:
- `flutter_tools` 会 exec 路径为 `.../windows-x64-release/gen_snapshot`(**没有 `.exe`**)
的文件,所以脚本在原 `.exe` 旁边放一个同名 shell 脚本转调 wine。
- `Runner.rc` 在 windres 下有两处不兼容:图标用反斜杠相对路径、`VERSION_AS_STRING`
依赖命令行传 `-D` 的转义字符串。脚本生成一份路径与宏都已规整的 rc 副本再编译。
`.gitea/workflows` 里的 `windows` 任务仍然跑在 `windows-latest` 上;若手头只有 macOS/Linux
构建机,可以把该任务的 `runs-on` 换成对应标签,直接复用这套交叉编译脚本,
不再需要 VS Build Tools。
+2
View File
@@ -74,6 +74,7 @@ public sealed record LanguageDto(string Code, string Label);
public sealed record SettingsDto( public sealed record SettingsDto(
string Language, string Language,
string Theme, string Theme,
string AccentColor,
int RenderFps, int RenderFps,
int MemoryMb, int MemoryMb,
bool MemoryAuto, bool MemoryAuto,
@@ -96,6 +97,7 @@ public sealed record SettingsDto(
public sealed record SettingsPatch( public sealed record SettingsPatch(
string? Language, string? Language,
string? Theme, string? Theme,
string? AccentColor,
int? RenderFps, int? RenderFps,
int? MemoryMb, int? MemoryMb,
bool? MemoryAuto, bool? MemoryAuto,
+135 -4
View File
@@ -53,18 +53,97 @@ var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = ar
builder.Logging.ClearProviders(); builder.Logging.ClearProviders();
builder.WebHost.UseUrls($"http://127.0.0.1:{port}"); builder.WebHost.UseUrls($"http://127.0.0.1:{port}");
// 本地伴随进程:限制请求体大小、关闭 Server 头、收紧超时,减少被本地恶意页面
// 或异常客户端拖垮的攻击面。
builder.WebHost.ConfigureKestrel(options =>
{
options.AddServerHeader = false;
options.Limits.MaxRequestBodySize = 2 * 1024 * 1024;
options.Limits.RequestHeadersTimeout = TimeSpan.FromSeconds(15);
options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(2);
options.Limits.MaxConcurrentConnections = 64;
});
// 桌面端(Windows/macOS)走原生 HTTP,不需要 CORS; // 桌面端(Windows/macOS)走原生 HTTP,不需要 CORS;
// 这里放开本机回环来源,方便用 `flutter run -d chrome` 调试界面。 // 这里放开本机回环来源,方便用 `flutter run -d chrome` 调试界面。
builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy
.SetIsOriginAllowed(origin => .SetIsOriginAllowed(origin =>
Uri.TryCreate(origin, UriKind.Absolute, out var uri) && Uri.TryCreate(origin, UriKind.Absolute, out var uri) &&
(uri.Host == "127.0.0.1" || uri.Host == "localhost")) (uri.Host == "127.0.0.1" || uri.Host == "localhost" || uri.Host == "::1"))
.AllowAnyHeader() .AllowAnyHeader()
.AllowAnyMethod())); .AllowAnyMethod()));
var app = builder.Build(); var app = builder.Build();
app.UseCors(); app.UseCors();
// 设置白名单 / 标识校验用到的规则(只在本进程内使用)。
var allowedLanguages = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{ "auto", "zh-CN", "en" };
var allowedThemes = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{ "light", "dark", "system" };
var accentHexRegex = new System.Text.RegularExpressions.Regex(
"^#(?:[0-9A-Fa-f]{6})$", System.Text.RegularExpressions.RegexOptions.Compiled);
var safeIdRegex = new System.Text.RegularExpressions.Regex(
"^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$", System.Text.RegularExpressions.RegexOptions.Compiled);
// 安全响应头 + Host/Origin 校验(抵御 DNS rebinding 与跨站调用)。
app.Use(async (context, next) =>
{
var headers = context.Response.Headers;
headers["X-Content-Type-Options"] = "nosniff";
headers["X-Frame-Options"] = "DENY";
headers["Referrer-Policy"] = "no-referrer";
headers["Content-Security-Policy"] = "default-src 'none'; frame-ancestors 'none'";
headers["Cache-Control"] = "no-store";
var host = context.Request.Host.Host;
if (!string.Equals(host, "127.0.0.1", StringComparison.OrdinalIgnoreCase) &&
!string.Equals(host, "localhost", StringComparison.OrdinalIgnoreCase) &&
!string.Equals(host, "::1", StringComparison.OrdinalIgnoreCase))
{
context.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}
var origin = context.Request.Headers.Origin.ToString();
if (!string.IsNullOrEmpty(origin) &&
!(Uri.TryCreate(origin, UriKind.Absolute, out var parsed) &&
(parsed.Host == "127.0.0.1" || parsed.Host == "localhost" || parsed.Host == "::1")))
{
context.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}
await next();
});
// 写入类接口做简单限流:单 IP 每秒最多 40 次,防止本地脚本刷爆下载/更新。
var writeBuckets =
new System.Collections.Concurrent.ConcurrentDictionary<string, (long Window, int Count)>();
app.Use(async (context, next) =>
{
if (HttpMethods.IsPost(context.Request.Method) ||
HttpMethods.IsDelete(context.Request.Method))
{
var key = context.Connection.RemoteIpAddress?.ToString() ?? "local";
var now = Environment.TickCount64;
var bucket = writeBuckets.AddOrUpdate(
key,
_ => (now, 1),
(_, old) => now - old.Window > 1000 ? (now, 1) : (old.Window, old.Count + 1));
if (bucket.Count > 40)
{
context.Response.StatusCode = StatusCodes.Status429TooManyRequests;
await context.Response.WriteAsJsonAsync(
new LaunchResultDto(false, "请求过于频繁,请稍后再试"));
return;
}
}
await next();
});
// ---- 健康检查 ------------------------------------------------------------- // ---- 健康检查 -------------------------------------------------------------
app.MapGet("/api/health", () => Results.Ok(new HealthDto( app.MapGet("/api/health", () => Results.Ok(new HealthDto(
@@ -81,6 +160,7 @@ app.MapGet("/api/models", () =>
app.MapGet("/api/models/{id}/preview", (string id) => app.MapGet("/api/models/{id}/preview", (string id) =>
{ {
if (!IsSafeId(id)) return Results.BadRequest();
var package = services.Models.Find(id); var package = services.Models.Find(id);
if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound(); if (package == null || !File.Exists(package.PreviewPath)) return Results.NotFound();
return Results.File(package.PreviewPath, "image/png"); return Results.File(package.PreviewPath, "image/png");
@@ -88,6 +168,7 @@ app.MapGet("/api/models/{id}/preview", (string id) =>
app.MapPost("/api/models/{id}/launch", async (string id) => app.MapPost("/api/models/{id}/launch", async (string id) =>
{ {
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
var package = services.Models.Find(id); var package = services.Models.Find(id);
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}")); if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
@@ -99,12 +180,15 @@ app.MapPost("/api/models/{id}/launch", async (string id) =>
} }
catch (Exception ex) catch (Exception ex)
{ {
return Results.Json(new LaunchResultDto(false, ex.Message), statusCode: 503); // 细节只写日志,不回显给调用方,避免泄漏本机路径等内部信息。
Console.Error.WriteLine($"[launch] 启动模型 {id} 失败: {ex}");
return Results.Json(new LaunchResultDto(false, "模型启动失败,请查看后端日志"), statusCode: 503);
} }
}); });
app.MapDelete("/api/models/{id}", (string id) => app.MapDelete("/api/models/{id}", (string id) =>
{ {
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
var ok = services.Models.Delete(id); var ok = services.Models.Delete(id);
if (ok) services.Models.NotifyChanged(); if (ok) services.Models.NotifyChanged();
return ok return ok
@@ -120,10 +204,21 @@ app.MapPost("/api/settings", (SettingsPatch? patch) =>
{ {
if (patch == null) return Results.BadRequest(new LaunchResultDto(false, "缺少设置内容")); if (patch == null) return Results.BadRequest(new LaunchResultDto(false, "缺少设置内容"));
// 白名单校验:设置项会写进磁盘并被前端直接使用,不接受任意字符串。
if (patch.Language != null && !allowedLanguages.Contains(patch.Language))
return Results.BadRequest(new LaunchResultDto(false, "不支持的界面语言"));
if (patch.Theme != null && !allowedThemes.Contains(patch.Theme))
return Results.BadRequest(new LaunchResultDto(false, "不支持的主题"));
if (patch.AccentColor != null && !accentHexRegex.IsMatch(patch.AccentColor))
return Results.BadRequest(new LaunchResultDto(false, "主题色需为 #RRGGBB"));
if (patch.UpdateRepository != null && !IsAllowedRepository(patch.UpdateRepository))
return Results.BadRequest(new LaunchResultDto(false, "更新仓库地址不受信任"));
services.Settings.Apply(s => services.Settings.Apply(s =>
{ {
if (patch.Language != null) s.Language = patch.Language; if (patch.Language != null) s.Language = patch.Language;
if (patch.Theme != null) s.Theme = patch.Theme; if (patch.Theme != null) s.Theme = patch.Theme;
if (patch.AccentColor != null) s.AccentColor = patch.AccentColor.ToUpperInvariant();
if (patch.RenderFps.HasValue) s.RenderFps = Math.Clamp(patch.RenderFps.Value, 12, 120); if (patch.RenderFps.HasValue) s.RenderFps = Math.Clamp(patch.RenderFps.Value, 12, 120);
if (patch.MemoryMb.HasValue) s.MemoryMb = Math.Clamp(patch.MemoryMb.Value, 256, 16384); if (patch.MemoryMb.HasValue) s.MemoryMb = Math.Clamp(patch.MemoryMb.Value, 256, 16384);
if (patch.MemoryAuto.HasValue) s.MemoryAuto = patch.MemoryAuto.Value; if (patch.MemoryAuto.HasValue) s.MemoryAuto = patch.MemoryAuto.Value;
@@ -159,7 +254,8 @@ app.MapPost("/api/sources/select", async (ForceRequest? request) =>
} }
catch (Exception ex) catch (Exception ex)
{ {
return Results.Json(new LaunchResultDto(false, ex.Message), statusCode: 503); Console.Error.WriteLine($"[sources] 切换模型源失败: {ex}");
return Results.Json(new LaunchResultDto(false, "模型源切换失败"), statusCode: 503);
} }
}); });
@@ -326,12 +422,16 @@ app.MapPost("/api/shell/open-folder", (PathRequest? request) =>
app.MapPost("/api/shell/open-url", (UrlRequest? request) => app.MapPost("/api/shell/open-url", (UrlRequest? request) =>
{ {
var url = request?.Url; var url = request?.Url;
if (string.IsNullOrWhiteSpace(url) || !Uri.TryCreate(url, UriKind.Absolute, out var uri)) if (string.IsNullOrWhiteSpace(url) || url.Length > 2048 ||
!Uri.TryCreate(url, UriKind.Absolute, out var uri))
return Results.BadRequest(new LaunchResultDto(false, "URL 无效")); return Results.BadRequest(new LaunchResultDto(false, "URL 无效"));
if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps) if (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)
return Results.BadRequest(new LaunchResultDto(false, "只允许 http/https 链接")); return Results.BadRequest(new LaunchResultDto(false, "只允许 http/https 链接"));
if (!string.IsNullOrEmpty(uri.UserInfo))
return Results.BadRequest(new LaunchResultDto(false, "URL 不允许携带账号密码"));
Shell.OpenUrl(url!); Shell.OpenUrl(url!);
return Results.Ok(new LaunchResultDto(true, "已打开链接")); return Results.Ok(new LaunchResultDto(true, "已打开链接"));
}); });
@@ -416,6 +516,7 @@ SourceDto ToSourceDto(ModelSource source) => new(
SettingsDto ToSettingsDto() => new( SettingsDto ToSettingsDto() => new(
services.Settings.Current.Language, services.Settings.Current.Language,
services.Settings.Current.Theme, services.Settings.Current.Theme,
services.Settings.Current.AccentColor,
services.Settings.Current.RenderFps, services.Settings.Current.RenderFps,
services.Settings.Current.MemoryMb, services.Settings.Current.MemoryMb,
services.Settings.Current.MemoryAuto, services.Settings.Current.MemoryAuto,
@@ -464,6 +565,7 @@ ModelSource? ResolveSource(string? sourceId)
IResult ActOnJob(string id, Action<IDownloadJob> action) IResult ActOnJob(string id, Action<IDownloadJob> action)
{ {
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "任务标识无效"));
var job = services.Downloads.Jobs.FirstOrDefault(j => var job = services.Downloads.Jobs.FirstOrDefault(j =>
j.Id.Equals(id, StringComparison.OrdinalIgnoreCase)); j.Id.Equals(id, StringComparison.OrdinalIgnoreCase));
if (job == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到任务 {id}")); if (job == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到任务 {id}"));
@@ -501,3 +603,32 @@ bool IsInsideKnownRoot(string path)
return false; return false;
} }
// 路由标识:只允许字母数字开头,后接字母数字/点/下划线/短横线,长度上限 64。
// 用于模型 id、任务 id,杜绝 `../` 之类的路径穿越尝试。
bool IsSafeId(string? id) => !string.IsNullOrEmpty(id) && safeIdRegex.IsMatch(id);
// 更新仓库地址:必须是 https、不带账号密码、不是回环/内网 IP。
// 防止把本地后端当成 SSRF 跳板去访问内网服务。
bool IsAllowedRepository(string value)
{
if (string.IsNullOrWhiteSpace(value)) return false;
if (!Uri.TryCreate(value, UriKind.Absolute, out var uri)) return false;
if (uri.Scheme != Uri.UriSchemeHttps) return false;
if (!string.IsNullOrEmpty(uri.UserInfo)) return false;
if (string.Equals(uri.Host, "localhost", StringComparison.OrdinalIgnoreCase)) return false;
if (System.Net.IPAddress.TryParse(uri.Host, out var ip) &&
(System.Net.IPAddress.IsLoopback(ip) || IsPrivateAddress(ip)))
return false;
return true;
}
static bool IsPrivateAddress(System.Net.IPAddress ip)
{
var bytes = ip.GetAddressBytes();
if (bytes.Length != 4) return false;
return bytes[0] == 10
|| (bytes[0] == 172 && bytes[1] >= 16 && bytes[1] <= 31)
|| (bytes[0] == 192 && bytes[1] == 168)
|| (bytes[0] == 169 && bytes[1] == 254);
}
+5
View File
@@ -152,6 +152,7 @@ class SettingsInfo {
SettingsInfo.fromJson(Map<String, dynamic> json) SettingsInfo.fromJson(Map<String, dynamic> json)
: language = json['language'] as String? ?? 'auto', : language = json['language'] as String? ?? 'auto',
theme = json['theme'] as String? ?? 'light', theme = json['theme'] as String? ?? 'light',
accentColor = json['accentColor'] as String? ?? '#8FB6FF',
renderFps = (json['renderFps'] as num?)?.toInt() ?? 120, renderFps = (json['renderFps'] as num?)?.toInt() ?? 120,
memoryMb = (json['memoryMb'] as num?)?.toInt() ?? 2048, memoryMb = (json['memoryMb'] as num?)?.toInt() ?? 2048,
memoryAuto = json['memoryAuto'] as bool? ?? true, memoryAuto = json['memoryAuto'] as bool? ?? true,
@@ -176,6 +177,7 @@ class SettingsInfo {
final String language; final String language;
final String theme; final String theme;
final String accentColor;
final int renderFps; final int renderFps;
final int memoryMb; final int memoryMb;
final bool memoryAuto; final bool memoryAuto;
@@ -200,6 +202,7 @@ class SettingsPatch {
const SettingsPatch({ const SettingsPatch({
this.language, this.language,
this.theme, this.theme,
this.accentColor,
this.renderFps, this.renderFps,
this.memoryMb, this.memoryMb,
this.memoryAuto, this.memoryAuto,
@@ -212,6 +215,7 @@ class SettingsPatch {
final String? language; final String? language;
final String? theme; final String? theme;
final String? accentColor;
final int? renderFps; final int? renderFps;
final int? memoryMb; final int? memoryMb;
final bool? memoryAuto; final bool? memoryAuto;
@@ -225,6 +229,7 @@ class SettingsPatch {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
if (language != null) map['language'] = language; if (language != null) map['language'] = language;
if (theme != null) map['theme'] = theme; if (theme != null) map['theme'] = theme;
if (accentColor != null) map['accentColor'] = accentColor;
if (renderFps != null) map['renderFps'] = renderFps; if (renderFps != null) map['renderFps'] = renderFps;
if (memoryMb != null) map['memoryMb'] = memoryMb; if (memoryMb != null) map['memoryMb'] = memoryMb;
if (memoryAuto != null) map['memoryAuto'] = memoryAuto; if (memoryAuto != null) map['memoryAuto'] = memoryAuto;
+14 -5
View File
@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
import 'api_client.dart'; import 'api_client.dart';
import 'i18n.dart'; import 'i18n.dart';
import 'theme.dart';
/// 外壳状态:后端客户端 + 设置 + 健康状态 + 更新状态条。 /// 外壳状态:后端客户端 + 设置 + 健康状态 + 更新状态条。
/// ///
@@ -27,16 +28,24 @@ class ShellController extends ChangeNotifier {
Future<void> bootstrap() async { Future<void> bootstrap() async {
try { try {
health = await api.health(); // 健康检查与设置并行请求:两者互不依赖,串行会白白多等一次网络往返。
settings = await api.settings(); final healthFuture = api.health();
final settingsFuture = api.settings();
health = await healthFuture;
settings = await settingsFuture;
loadError = null; loadError = null;
I18n.setLanguage(settings!.language); _applySettings(settings!);
} catch (error) { } catch (error) {
loadError = error.toString(); loadError = error.toString();
} }
notifyListeners(); notifyListeners();
} }
void _applySettings(SettingsInfo value) {
I18n.setLanguage(value.language);
GcPalette.apply(value.accentColor);
}
void goTo(int value) { void goTo(int value) {
if (index == value) return; if (index == value) return;
index = value; index = value;
@@ -47,7 +56,7 @@ class ShellController extends ChangeNotifier {
try { try {
settings = await api.settings(); settings = await api.settings();
loadError = null; loadError = null;
I18n.setLanguage(settings!.language); _applySettings(settings!);
} catch (error) { } catch (error) {
loadError = error.toString(); loadError = error.toString();
} }
@@ -58,7 +67,7 @@ class ShellController extends ChangeNotifier {
try { try {
settings = await api.saveSettings(patch); settings = await api.saveSettings(patch);
loadError = null; loadError = null;
I18n.setLanguage(settings!.language); _applySettings(settings!);
} catch (error) { } catch (error) {
loadError = error.toString(); loadError = error.toString();
} }
+16
View File
@@ -23,6 +23,7 @@ class I18n {
'home.settings': '设置', 'home.settings': '设置',
'home.installed': '已安装模型', 'home.installed': '已安装模型',
'home.count': '{0} 个模型', 'home.count': '{0} 个模型',
'home.noDescription': '暂无简介',
'home.empty': '模型库还是空的', 'home.empty': '模型库还是空的',
'home.emptyHint': '启动时会自动检查并下载模型。若当前断网:可把模型文件夹放进 .GC/model/ 后重新打开,或联网后在「下载」页点重试。', 'home.emptyHint': '启动时会自动检查并下载模型。若当前断网:可把模型文件夹放进 .GC/model/ 后重新打开,或联网后在「下载」页点重试。',
'home.emptyAction': '去下载模型', 'home.emptyAction': '去下载模型',
@@ -62,6 +63,12 @@ class I18n {
'set.title': '设置', 'set.title': '设置',
'set.subtitle': '模型源、启动时内存分配与本地存储。', 'set.subtitle': '模型源、启动时内存分配与本地存储。',
'set.general': '通用', 'set.general': '通用',
'set.appearance': '外观',
'set.accent': '主题颜色',
'set.accent.desc': '选择启动器的主色调,按钮、滑块与高亮会同步换色。',
'set.accent.custom': '自定义颜色',
'set.accent.hexHint': '格式 #RRGGBB,例如 #8FB6FF',
'set.accent.invalid': '颜色格式无效,请使用 #RRGGBB',
'set.language': '界面语言', 'set.language': '界面语言',
'set.language.auto': '跟随系统', 'set.language.auto': '跟随系统',
'set.fps': '渲染帧率', 'set.fps': '渲染帧率',
@@ -117,6 +124,7 @@ class I18n {
'common.error': '出错了', 'common.error': '出错了',
'common.refresh': '刷新', 'common.refresh': '刷新',
'about.developers': '开发者', 'about.developers': '开发者',
'about.contributorsHint': '来自仓库提交记录',
'about.repository': '仓库', 'about.repository': '仓库',
'about.openRepository': '打开仓库', 'about.openRepository': '打开仓库',
'about.contributions': '{0} 次提交', 'about.contributions': '{0} 次提交',
@@ -140,6 +148,7 @@ class I18n {
'home.settings': 'Settings', 'home.settings': 'Settings',
'home.installed': 'Installed models', 'home.installed': 'Installed models',
'home.count': '{0} models', 'home.count': '{0} models',
'home.noDescription': 'No description',
'home.empty': 'No models yet', 'home.empty': 'No models yet',
'home.emptyHint': 'Models are checked and downloaded on startup. Offline: drop model folders into .GC/model/ and reopen, or retry from the Download page once online.', 'home.emptyHint': 'Models are checked and downloaded on startup. Offline: drop model folders into .GC/model/ and reopen, or retry from the Download page once online.',
'home.emptyAction': 'Get models', 'home.emptyAction': 'Get models',
@@ -179,6 +188,12 @@ class I18n {
'set.title': 'Settings', 'set.title': 'Settings',
'set.subtitle': 'Model sources, startup memory allocation and local storage.', 'set.subtitle': 'Model sources, startup memory allocation and local storage.',
'set.general': 'General', 'set.general': 'General',
'set.appearance': 'Appearance',
'set.accent': 'Theme color',
'set.accent.desc': 'Pick the launcher accent color; buttons, sliders and highlights follow it.',
'set.accent.custom': 'Custom color',
'set.accent.hexHint': 'Format #RRGGBB, e.g. #8FB6FF',
'set.accent.invalid': 'Invalid color, use #RRGGBB',
'set.language': 'Language', 'set.language': 'Language',
'set.language.auto': 'System', 'set.language.auto': 'System',
'set.fps': 'Render frame rate', 'set.fps': 'Render frame rate',
@@ -234,6 +249,7 @@ class I18n {
'common.error': 'Something went wrong', 'common.error': 'Something went wrong',
'common.refresh': 'Refresh', 'common.refresh': 'Refresh',
'about.developers': 'Developers', 'about.developers': 'Developers',
'about.contributorsHint': 'From repository commits',
'about.repository': 'Repository', 'about.repository': 'Repository',
'about.openRepository': 'Open repository', 'about.openRepository': 'Open repository',
'about.contributions': '{0} commits', 'about.contributions': '{0} commits',
+15 -5
View File
@@ -6,6 +6,9 @@ import 'shell.dart';
import 'theme.dart'; import 'theme.dart';
void main() { void main() {
// 桌面端无需异步初始化外部插件:尽早绑定并直接渲染首帧,
// 让窗口在引擎就绪后立刻出现,后端探测在外壳里异步进行。
WidgetsFlutterBinding.ensureInitialized();
runApp(const GcUiApp()); runApp(const GcUiApp());
} }
@@ -25,14 +28,21 @@ class _GcUiAppState extends State<GcUiApp> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// 语言与强调色都会触发重建:只重建 MaterialApp 的主题层,
// 不触碰页面状态(页面由 ShellPage 自己持有)。
return ValueListenableBuilder<String>( return ValueListenableBuilder<String>(
valueListenable: I18n.language, valueListenable: I18n.language,
builder: (context, language, _) { builder: (context, language, _) {
return MaterialApp( return ValueListenableBuilder<Color>(
title: 'Morris GC', valueListenable: GcPalette.accent,
debugShowCheckedModeBanner: false, builder: (context, accent, _) {
theme: buildGcTheme(), return MaterialApp(
home: ShellPage(controller: _controller), title: 'Morris GC',
debugShowCheckedModeBanner: false,
theme: buildGcTheme(),
home: ShellPage(controller: _controller),
);
},
); );
}, },
); );
+391 -93
View File
@@ -344,7 +344,7 @@ class _HomePageViewState extends State<HomePageView> {
} }
} }
class _ModelCard extends StatelessWidget { class _ModelCard extends StatefulWidget {
const _ModelCard({ const _ModelCard({
required this.model, required this.model,
required this.previewUrl, required this.previewUrl,
@@ -359,110 +359,249 @@ class _ModelCard extends StatelessWidget {
final VoidCallback onOpenFolder; final VoidCallback onOpenFolder;
final VoidCallback onDelete; final VoidCallback onDelete;
@override
State<_ModelCard> createState() => _ModelCardState();
}
class _ModelCardState extends State<_ModelCard> {
bool _hover = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox( final model = widget.model;
width: 336, return MouseRegion(
child: GcCard( onEnter: (_) => setState(() => _hover = true),
padding: EdgeInsets.zero, onExit: (_) => setState(() => _hover = false),
child: Column( cursor: SystemMouseCursors.click,
crossAxisAlignment: CrossAxisAlignment.start, child: AnimatedContainer(
children: <Widget>[ duration: const Duration(milliseconds: 160),
ClipRRect( curve: Curves.easeOut,
borderRadius: const BorderRadius.vertical(top: Radius.circular(13)), width: 336,
child: SizedBox( transform: Matrix4.translationValues(0, _hover ? -3 : 0, 0),
height: 138, decoration: BoxDecoration(
width: double.infinity, borderRadius: BorderRadius.circular(16),
child: Container( boxShadow: <BoxShadow>[
color: const Color(0xFF0B1226), BoxShadow(
child: model.hasPreview color: Colors.black.withOpacity(_hover ? 0.42 : 0.22),
? Image.network( blurRadius: _hover ? 26 : 14,
previewUrl, offset: Offset(0, _hover ? 10 : 6),
fit: BoxFit.cover,
errorBuilder: (context, error, stack) =>
const _PreviewFallback(),
)
: const _PreviewFallback(),
),
),
), ),
Padding( ],
padding: const EdgeInsets.fromLTRB(16, 13, 16, 15), ),
child: Column( child: GcCard(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.zero,
children: <Widget>[ child: Column(
Row( crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
// 封面:图片 + 底部渐变遮罩 + 播放提示 + 版本徽章。
ClipRRect(
borderRadius:
const BorderRadius.vertical(top: Radius.circular(13)),
child: SizedBox(
height: 152,
width: double.infinity,
child: Stack(
fit: StackFit.expand,
children: <Widget>[ children: <Widget>[
Expanded( Container(
child: Text( color: const Color(0xFF0B1226),
model.name, child: model.hasPreview
overflow: TextOverflow.ellipsis, ? Image.network(
style: const TextStyle( widget.previewUrl,
fontSize: 14, fit: BoxFit.cover,
fontWeight: FontWeight.w600, // 只按展示尺寸解码,避免大图占用内存、拖慢首帧。
color: GcColors.ink, cacheWidth: 672,
errorBuilder: (context, error, stack) =>
const _PreviewFallback(),
)
: const _PreviewFallback(),
),
const DecoratedBox(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: <Color>[
Color(0x00000000),
Color(0x22000000),
Color(0xE60A1226),
],
stops: <double>[0.45, 0.72, 1.0],
), ),
), ),
), ),
const SizedBox(width: 8), Positioned(
Text( left: 14,
model.metaText, right: 14,
style: const TextStyle( bottom: 11,
fontSize: 10.5, child: Row(
color: GcColors.faint, children: <Widget>[
if (model.version.isNotEmpty)
_CoverPill(
text: 'v${model.version}',
color: GcColors.accent,
),
if (model.author.isNotEmpty) ...<Widget>[
const SizedBox(width: 8),
Flexible(
child: Text(
model.author,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 10.5,
color: Colors.white70,
),
),
),
],
const Spacer(),
AnimatedOpacity(
opacity: _hover ? 1 : 0,
duration: const Duration(milliseconds: 160),
child: Container(
width: 30,
height: 30,
decoration: BoxDecoration(
color: GcColors.accent.withOpacity(0.9),
shape: BoxShape.circle,
),
child: const Icon(Icons.play_arrow_rounded,
size: 20, color: Color(0xFF08101F)),
),
),
],
), ),
), ),
], ],
), ),
const SizedBox(height: 7), ),
SizedBox( ),
height: 34, Padding(
child: Text( padding: const EdgeInsets.fromLTRB(16, 13, 16, 15),
model.description, child: Column(
maxLines: 2, crossAxisAlignment: CrossAxisAlignment.start,
overflow: TextOverflow.ellipsis, children: <Widget>[
style: const TextStyle( Row(
fontSize: 12, children: <Widget>[
color: GcColors.muted, Expanded(
height: 1.4, child: Text(
model.name,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 14.5,
fontWeight: FontWeight.w700,
color: GcColors.ink,
),
),
),
const SizedBox(width: 8),
Text(
model.sizeText,
style: const TextStyle(
fontSize: 10.5,
color: GcColors.faint,
),
),
],
),
const SizedBox(height: 7),
// 简介:固定两行高度,避免卡片高低不齐。
SizedBox(
height: 34,
child: Text(
model.description.isEmpty
? T('home.noDescription')
: model.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12,
height: 1.4,
color: model.description.isEmpty
? GcColors.faint
: GcColors.muted,
),
), ),
), ),
), if (model.tags.isNotEmpty) ...<Widget>[
if (model.tags.isNotEmpty) ...<Widget>[ const SizedBox(height: 8),
const SizedBox(height: 6), Wrap(
Text( spacing: 6,
model.tags.join(' · '), runSpacing: 4,
style: const TextStyle( children: <Widget>[
fontSize: 10.5, for (final tag in model.tags.take(3))
color: GcColors.faint, _CoverPill(
text: tag,
color: GcColors.muted,
subtle: true,
),
],
), ),
],
const SizedBox(height: 13),
Row(
children: <Widget>[
FilledButton.icon(
onPressed: widget.onLaunch,
icon: const Icon(Icons.play_arrow_rounded, size: 17),
label: Text(T('home.launch')),
),
const Spacer(),
TextButton(
onPressed: widget.onOpenFolder,
child: Text(T('home.open')),
),
TextButton(
onPressed: widget.onDelete,
style: TextButton.styleFrom(
foregroundColor: GcColors.danger,
),
child: Text(T('home.delete')),
),
],
), ),
], ],
const SizedBox(height: 12), ),
Row(
children: <Widget>[
FilledButton(
onPressed: onLaunch,
child: Text(T('home.launch')),
),
const Spacer(),
TextButton(
onPressed: onOpenFolder,
child: Text(T('home.open')),
),
TextButton(
onPressed: onDelete,
style: TextButton.styleFrom(
foregroundColor: GcColors.danger,
),
child: Text(T('home.delete')),
),
],
),
],
), ),
), ],
], ),
),
),
);
}
}
/// 封面上的小胶囊标签(版本 / 标签)。
class _CoverPill extends StatelessWidget {
const _CoverPill({
required this.text,
required this.color,
this.subtle = false,
});
final String text;
final Color color;
final bool subtle;
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration(
color: subtle ? GcColors.surfaceAlt : color.withOpacity(0.14),
borderRadius: BorderRadius.circular(999),
border: Border.all(
color: subtle ? GcColors.line : color.withOpacity(0.35),
),
),
child: Text(
text,
style: TextStyle(
fontSize: 10,
height: 1.1,
color: subtle ? GcColors.faint : color,
fontWeight: FontWeight.w600,
), ),
), ),
); );
@@ -473,12 +612,23 @@ class _PreviewFallback extends StatelessWidget {
const _PreviewFallback(); const _PreviewFallback();
@override @override
Widget build(BuildContext context) => const Center( Widget build(BuildContext context) {
return Container(
decoration: const BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: <Color>[Color(0xFF16233C), Color(0xFF0B1226)],
),
),
child: const Center(
child: Text( child: Text(
'◎', '◎',
style: TextStyle(fontSize: 34, color: Color(0xFF1B2A47)), style: TextStyle(fontSize: 34, color: Color(0xFF24365A)),
), ),
); ),
);
}
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -1020,6 +1170,8 @@ class _SettingsPageViewState extends State<SettingsPageView> {
const SizedBox(height: 18), const SizedBox(height: 18),
_generalCard(settings), _generalCard(settings),
const SizedBox(height: 16), const SizedBox(height: 16),
_appearanceCard(settings),
const SizedBox(height: 16),
_memoryCard(settings), _memoryCard(settings),
const SizedBox(height: 16), const SizedBox(height: 16),
_sourcesCard(settings), _sourcesCard(settings),
@@ -1106,6 +1258,149 @@ class _SettingsPageViewState extends State<SettingsPageView> {
); );
} }
Widget _appearanceCard(SettingsInfo settings) {
final current =
GcPalette.parseHex(settings.accentColor) ?? GcPalette.defaultAccent;
return GcCard(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
GcSectionTitle(T('set.appearance')),
const SizedBox(height: 8),
GcHint(T('set.accent.desc')),
const SizedBox(height: 14),
Wrap(
spacing: 10,
runSpacing: 10,
children: <Widget>[
for (final color in GcPalette.presets)
_accentSwatch(color, current),
_customAccentChip(),
],
),
const SizedBox(height: 12),
Text(
'${T('set.accent')}: ${GcPalette.toHex(current)}',
style: const TextStyle(fontSize: 11.5, color: GcColors.faint),
),
],
),
);
}
Widget _accentSwatch(Color color, Color current) {
// ignore: deprecated_member_use
final selected = color.value == current.value;
return Tooltip(
message: GcPalette.toHex(color),
child: GestureDetector(
onTap: () => _applyAccent(GcPalette.toHex(color)),
child: Container(
width: 36,
height: 36,
decoration: BoxDecoration(
color: color,
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: selected ? Colors.white : Colors.transparent,
width: 2,
),
boxShadow: <BoxShadow>[
BoxShadow(
color: color.withOpacity(selected ? 0.55 : 0.18),
blurRadius: selected ? 14 : 6,
),
],
),
child: selected
? const Icon(Icons.check_rounded,
size: 19, color: Color(0xFF08101F))
: null,
),
),
);
}
Widget _customAccentChip() {
return MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: _pickCustomAccent,
child: Container(
height: 36,
padding: const EdgeInsets.symmetric(horizontal: 12),
decoration: BoxDecoration(
color: GcColors.surfaceAlt,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: GcColors.line),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
const Icon(Icons.colorize_rounded,
size: 16, color: GcColors.faint),
const SizedBox(width: 6),
Text(
T('set.accent.custom'),
style: const TextStyle(fontSize: 11.5, color: GcColors.muted),
),
],
),
),
),
);
}
Future<void> _pickCustomAccent() async {
final controller = TextEditingController(
text: GcPalette.toHex(GcPalette.accent.value),
);
final hex = await showDialog<String>(
context: context,
builder: (context) => AlertDialog(
backgroundColor: GcColors.surfaceAlt,
title: Text(T('set.accent.custom')),
content: TextField(
controller: controller,
autofocus: true,
style: const TextStyle(color: GcColors.ink),
decoration: InputDecoration(
hintText: '#8FB6FF',
hintStyle: const TextStyle(color: GcColors.faint),
helperText: T('set.accent.hexHint'),
helperStyle: const TextStyle(color: GcColors.faint, fontSize: 11),
),
onSubmitted: (value) => Navigator.of(context).pop(value),
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: Text(T('common.cancel')),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(controller.text),
child: Text(T('common.confirm')),
),
],
),
);
controller.dispose();
if (hex != null) await _applyAccent(hex);
}
Future<void> _applyAccent(String hex) async {
final parsed = GcPalette.parseHex(hex);
if (parsed == null) {
if (mounted) setState(() => _status = T('set.accent.invalid'));
return;
}
final normalized = GcPalette.toHex(parsed);
GcPalette.apply(normalized); // 立即预览
await widget.controller
.saveSettings(SettingsPatch(accentColor: normalized));
if (mounted) setState(() => _status = T('common.applied'));
}
Widget _memoryCard(SettingsInfo settings) { Widget _memoryCard(SettingsInfo settings) {
return GcCard( return GcCard(
child: Column( child: Column(
@@ -1491,7 +1786,10 @@ class _AboutPageViewState extends State<AboutPageView> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
GcSectionTitle(T('about.developers')), GcSectionTitle(
T('about.developers'),
trailing: GcHint(T('about.contributorsHint')),
),
const SizedBox(height: 12), const SizedBox(height: 12),
if ((_about?.contributors ?? const <ContributorInfo>[]).isEmpty) if ((_about?.contributors ?? const <ContributorInfo>[]).isEmpty)
GcHint(T('about.noContributors')) GcHint(T('about.noContributors'))
@@ -1508,7 +1806,7 @@ class _AboutPageViewState extends State<AboutPageView> {
? null ? null
: NetworkImage(contributor.avatarUrl!), : NetworkImage(contributor.avatarUrl!),
child: contributor.avatarUrl == null child: contributor.avatarUrl == null
? const Text('◎', ? Text('◎',
style: TextStyle( style: TextStyle(
fontSize: 12, color: GcColors.accent)) fontSize: 12, color: GcColors.accent))
: null, : null,
+28 -3
View File
@@ -31,6 +31,10 @@ class ShellPage extends StatefulWidget {
} }
class _ShellPageState extends State<ShellPage> { class _ShellPageState extends State<ShellPage> {
/// 页面缓存:键为「索引:语言」。同一个页面只构建一次,切走时用
/// [Offstage] 保活(不参与布局/绘制),切回来无需重建、状态也不丢。
final Map<String, Widget> _pages = <String, Widget>{};
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -78,7 +82,27 @@ class _ShellPageState extends State<ShellPage> {
); );
} }
switch (controller.index) { // 只构建当前页;其余已访问页面保留在树上但处于 Offstage。
final key = '${controller.index}:${I18n.language.value}';
_pages.putIfAbsent(key, () => _buildPage(controller, controller.index));
final visibleKey = key;
return Stack(
children: <Widget>[
for (final entry in _pages.entries)
Offstage(
offstage: entry.key != visibleKey,
child: TickerMode(
enabled: entry.key == visibleKey,
child: entry.value,
),
),
],
);
}
Widget _buildPage(ShellController controller, int index) {
switch (index) {
case 1: case 1:
return DownloadPageView(controller: controller); return DownloadPageView(controller: controller);
case 2: case 2:
@@ -116,7 +140,7 @@ class _Sidebar extends StatelessWidget {
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
alignment: Alignment.center, alignment: Alignment.center,
child: const Text( child: Text(
'◎', '◎',
style: TextStyle(fontSize: 14, color: GcColors.accent), style: TextStyle(fontSize: 14, color: GcColors.accent),
), ),
@@ -241,7 +265,8 @@ class _UpdateBar extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 9), padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 9),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
const Text('⟳', style: TextStyle(fontSize: 16, color: GcColors.accent)), Text('⟳',
style: TextStyle(fontSize: 16, color: GcColors.accent)),
const SizedBox(width: 12), const SizedBox(width: 12),
Expanded( Expanded(
child: Column( child: Column(
+77 -10
View File
@@ -1,5 +1,58 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
/// 主题强调色(可在设置页自定义,并持久化到后端 settings.accentColor)。
///
/// 用 [ValueNotifier] 持有当前颜色:设置页改色后,`main.dart` 监听到变化
/// 会重建 `MaterialApp.theme`,所有引用 [GcColors.accent] 的组件随之换色。
class GcPalette {
GcPalette._();
/// 默认强调色,与 Avalonia 启动器一致。
static const Color defaultAccent = Color(0xFF8FB6FF);
static final ValueNotifier<Color> accent =
ValueNotifier<Color>(defaultAccent);
/// 设置页可选的预设色板。
static const List<Color> presets = <Color>[
Color(0xFF8FB6FF), // 极光蓝(默认)
Color(0xFF7C6CFF), // 星云紫
Color(0xFF4FD1C5), // 湖水青
Color(0xFF6BE3A2), // 极光绿
Color(0xFFFFC46B), // 暖阳橙
Color(0xFFFF8FB1), // 樱粉
Color(0xFFFF7A7A), // 珊瑚红
Color(0xFFB0BEC5), // 石墨灰
];
/// 把 `#RRGGBB` / `RRGGBB` 解析为颜色;非法返回 null。
static Color? parseHex(String? value) {
if (value == null) return null;
var hex = value.trim();
if (hex.startsWith('#')) hex = hex.substring(1);
if (hex.length == 8) hex = hex.substring(2); // 忽略 alpha
if (hex.length != 6) return null;
final parsed = int.tryParse(hex, radix: 16);
if (parsed == null) return null;
return Color(0xFF000000 | parsed);
}
/// 颜色转 `#RRGGBB`。
static String toHex(Color color) {
// ignore: deprecated_member_use
final rgb = color.value & 0xFFFFFF;
return '#${rgb.toRadixString(16).padLeft(6, '0').toUpperCase()}';
}
/// 应用颜色(来自后端设置或用户点选)。
static void apply(String? hex) {
final color = parseHex(hex);
if (color == null) return;
// ignore: deprecated_member_use
if (accent.value.value != color.value) accent.value = color;
}
}
/// 与 Avalonia 启动器一致的深色配色。 /// 与 Avalonia 启动器一致的深色配色。
class GcColors { class GcColors {
GcColors._(); GcColors._();
@@ -9,23 +62,37 @@ class GcColors {
static const Color surface = Color(0xFF111C33); static const Color surface = Color(0xFF111C33);
static const Color surfaceAlt = Color(0xFF16233C); static const Color surfaceAlt = Color(0xFF16233C);
static const Color line = Color(0xFF1B2740); static const Color line = Color(0xFF1B2740);
static const Color accent = Color(0xFF8FB6FF);
static const Color accentStrong = Color(0xFF4C7DFF);
static const Color ink = Color(0xFFF2F6FF); static const Color ink = Color(0xFFF2F6FF);
static const Color muted = Color(0xFFA9B8D4); static const Color muted = Color(0xFFA9B8D4);
static const Color faint = Color(0xFF7C90B4); static const Color faint = Color(0xFF7C90B4);
static const Color warn = Color(0xFFFFC46B); static const Color warn = Color(0xFFFFC46B);
static const Color danger = Color(0xFFFF7A7A); static const Color danger = Color(0xFFFF7A7A);
static const Color ok = Color(0xFF6BE3A2); static const Color ok = Color(0xFF6BE3A2);
/// 当前强调色(动态,跟随设置)。
static Color get accent => GcPalette.accent.value;
/// 强调色的加深版本,用于主按钮 / 轨道。
static Color get accentStrong => _strongen(accent);
static Color _strongen(Color color) {
final hsl = HSLColor.fromColor(color);
return hsl
.withSaturation((hsl.saturation + 0.12).clamp(0.0, 1.0))
.withLightness((hsl.lightness - 0.10).clamp(0.0, 1.0))
.toColor();
}
} }
ThemeData buildGcTheme() { ThemeData buildGcTheme() {
final base = ThemeData.dark(useMaterial3: true); final base = ThemeData.dark(useMaterial3: true);
final accent = GcColors.accent;
final accentStrong = GcColors.accentStrong;
return base.copyWith( return base.copyWith(
scaffoldBackgroundColor: GcColors.appBg, scaffoldBackgroundColor: GcColors.appBg,
colorScheme: base.colorScheme.copyWith( colorScheme: base.colorScheme.copyWith(
primary: GcColors.accentStrong, primary: accentStrong,
secondary: GcColors.accent, secondary: accent,
surface: GcColors.surface, surface: GcColors.surface,
error: GcColors.danger, error: GcColors.danger,
), ),
@@ -40,24 +107,24 @@ ThemeData buildGcTheme() {
margin: EdgeInsets.zero, margin: EdgeInsets.zero,
), ),
sliderTheme: base.sliderTheme.copyWith( sliderTheme: base.sliderTheme.copyWith(
activeTrackColor: GcColors.accentStrong, activeTrackColor: accentStrong,
thumbColor: GcColors.accent, thumbColor: accent,
inactiveTrackColor: GcColors.line, inactiveTrackColor: GcColors.line,
), ),
switchTheme: SwitchThemeData( switchTheme: SwitchThemeData(
thumbColor: WidgetStateProperty.resolveWith( thumbColor: WidgetStateProperty.resolveWith(
(states) => states.contains(WidgetState.selected) (states) => states.contains(WidgetState.selected)
? GcColors.accent ? accent
: GcColors.faint, : GcColors.faint,
), ),
trackColor: WidgetStateProperty.resolveWith( trackColor: WidgetStateProperty.resolveWith(
(states) => states.contains(WidgetState.selected) (states) => states.contains(WidgetState.selected)
? GcColors.accentStrong.withOpacity(0.45) ? accentStrong.withOpacity(0.45)
: GcColors.line, : GcColors.line,
), ),
), ),
progressIndicatorTheme: const ProgressIndicatorThemeData( progressIndicatorTheme: ProgressIndicatorThemeData(
color: GcColors.accent, color: accent,
linearTrackColor: GcColors.line, linearTrackColor: GcColors.line,
), ),
tooltipTheme: const TooltipThemeData( tooltipTheme: const TooltipThemeData(
@@ -5,10 +5,10 @@
// 'flutter create' template. // 'flutter create' template.
// The application's name. By default this is also the title of the Flutter window. // The application's name. By default this is also the title of the Flutter window.
PRODUCT_NAME = gc_ui PRODUCT_NAME = GC-UI
// The application's bundle identifier // The application's bundle identifier
PRODUCT_BUNDLE_IDENTIFIER = com.morris.gc.gcUi PRODUCT_BUNDLE_IDENTIFIER = com.morris.gc.gcUi
// The copyright displayed in application information // The copyright displayed in application information
PRODUCT_COPYRIGHT = Copyright © 2026 com.morris.gc. All rights reserved. PRODUCT_COPYRIGHT = Copyright © 2026 Morris. All rights reserved.
+1 -1
View File
@@ -4,7 +4,7 @@ project(gc_ui LANGUAGES CXX)
# The name of the executable created for the application. Change this to change # The name of the executable created for the application. Change this to change
# the on-disk name of your application. # the on-disk name of your application.
set(BINARY_NAME "gc_ui") set(BINARY_NAME "GC-UI")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake. # versions of CMake.
+6 -6
View File
@@ -89,13 +89,13 @@ BEGIN
BEGIN BEGIN
BLOCK "040904e4" BLOCK "040904e4"
BEGIN BEGIN
VALUE "CompanyName", "com.morris.gc" "\0" VALUE "CompanyName", "Morris" "\0"
VALUE "FileDescription", "gc_ui" "\0" VALUE "FileDescription", "GC UI" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "FileVersion", VERSION_AS_STRING "\0"
VALUE "InternalName", "gc_ui" "\0" VALUE "InternalName", "GC-UI" "\0"
VALUE "LegalCopyright", "Copyright (C) 2026 com.morris.gc. All rights reserved." "\0" VALUE "LegalCopyright", "Copyright (C) 2026 Morris. All rights reserved." "\0"
VALUE "OriginalFilename", "gc_ui.exe" "\0" VALUE "OriginalFilename", "GC-UI.exe" "\0"
VALUE "ProductName", "gc_ui" "\0" VALUE "ProductName", "Morris GC" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"
END END
END END
+1 -1
View File
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project); FlutterWindow window(project);
Win32Window::Point origin(10, 10); Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720); Win32Window::Size size(1280, 720);
if (!window.Create(L"gc_ui", origin, size)) { if (!window.Create(L"Morris GC", origin, size)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
window.SetQuitOnClose(true); window.SetQuitOnClose(true);
+5 -2
View File
@@ -13,6 +13,9 @@ public sealed class AppSettings
/// <summary>light | dark</summary> /// <summary>light | dark</summary>
public string Theme { get; set; } = "light"; public string Theme { get; set; } = "light";
/// <summary>主题强调色(#RRGGBB),由设置页自定义并持久化。</summary>
public string AccentColor { get; set; } = "#8FB6FF";
/// <summary>渲染帧率:24 / 30 / 60 / 90 / 120(上限 120,关闭 VSync 同步)</summary> /// <summary>渲染帧率:24 / 30 / 60 / 90 / 120(上限 120,关闭 VSync 同步)</summary>
public int RenderFps { get; set; } = 120; public int RenderFps { get; set; } = 120;
@@ -37,8 +40,8 @@ public sealed class AppSettings
/// <summary>启动时检查模型 / 启动器是否为最新版。</summary> /// <summary>启动时检查模型 / 启动器是否为最新版。</summary>
public bool AutoUpdateOnStartup { get; set; } = true; public bool AutoUpdateOnStartup { get; set; } = true;
/// <summary>默认更新仓库地址。</summary> /// <summary>默认更新仓库地址(暂时只使用 Xhmcl,GitCode 实现保留但不再调用)。</summary>
public string UpdateRepository { get; set; } = "https://gitcode.com/Morris_1/GC"; public string UpdateRepository { get; set; } = "https://git.xhmcl.com/Morris/GC";
/// <summary>版本清单地址覆盖(留空则按 UpdateRepository 拼接)。</summary> /// <summary>版本清单地址覆盖(留空则按 UpdateRepository 拼接)。</summary>
public string? UpdateManifestUrl { get; set; } public string? UpdateManifestUrl { get; set; }
+11 -2
View File
@@ -20,12 +20,21 @@ public static class SignatureKeyring
private static readonly List<KeyEntry> KeysInternal = new() private static readonly List<KeyEntry> KeysInternal = new()
{ {
// 生产密钥(2026-11 生成)。指纹 b41b1dd6259ea9ed // 生产密钥(2026-12 换发)。指纹 ee6083be47a87907
// 上一代 gc-2026-11 的私钥没有留存,无法再签出可通过校验的清单,
// 因此新增这一把;旧公钥保留一个版本周期,方便过渡期排查。
new KeyEntry(
"gc-2026-12",
"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4R+R2Pvinsu/xdaUu5mATPyYoEpL6" +
"cyugSVKAVMz6yY15SjkgEvdosfWuQJBbrPOOgGulE6Jht6v7FZx1dQguQ==",
"GC 主发布密钥"),
// 已停用(私钥遗失):保留仅为兼容历史诊断输出,不能用于验签新清单。
new KeyEntry( new KeyEntry(
"gc-2026-11", "gc-2026-11",
"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEny5YKVBZUzOyRcSiuutlGmBb4+xm" + "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEny5YKVBZUzOyRcSiuutlGmBb4+xm" +
"PrNDGshilBlpmFyWu5Atq+FGP2tn+8Or8V7OH+/7lhCmXu8jZuC5/5CWSw==", "PrNDGshilBlpmFyWu5Atq+FGP2tn+8Or8V7OH+/7lhCmXu8jZuC5/5CWSw==",
"GC 主发布密钥") "已停用:私钥遗失")
}; };
static SignatureKeyring() => LoadFromEnvironment(); static SignatureKeyring() => LoadFromEnvironment();
+191 -46
View File
@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Text.Json; using System.Text.Json;
using System.Threading; using System.Threading;
@@ -7,50 +8,70 @@ using System.Threading.Tasks;
namespace GC.Services; namespace GC.Services;
/// <summary>GitCode 仓库的一位贡献者。</summary> /// <summary>仓库的一位贡献者(按人归并后的结果)。</summary>
public sealed class Contributor public sealed class Contributor
{ {
public string Name { get; set; } = ""; public string Name { get; set; } = "";
public string? Email { get; set; } public string? Email { get; set; }
/// <summary>提交次数(API 里的 contributions)。</summary> /// <summary>提交次数。</summary>
public int Contributions { get; set; } public int Contributions { get; set; }
/// <summary> /// <summary>接口直接返回的头像地址(Gitea 的 avatar_url);为空时按邮箱哈希生成。</summary>
/// 登录名 -> 展示名。GitCode 的 contributors 接口只返回账号登录名, public string? Avatar { get; set; }
/// 不返回真实姓名,这里做一层映射,让关于页显示作者想展示的名字。
/// </summary>
private static readonly Dictionary<string, string> DisplayNames = new(StringComparer.OrdinalIgnoreCase)
{
["Morris_1"] = "Morris"
};
/// <summary>头像地址:GitCode 用邮箱哈希拼头像,取不到时返回 null。</summary> /// <summary>最近一次提交时间,用于贡献数相同时排序。</summary>
public DateTimeOffset? LastCommit { get; set; }
/// <summary>关于页展示的名字。</summary>
public string DisplayName => string.IsNullOrWhiteSpace(Name) ? "匿名" : Name;
/// <summary>头像地址:优先用接口返回的头像,否则按邮箱哈希拼 GitCode 头像。</summary>
public string? AvatarUrl => public string? AvatarUrl =>
string.IsNullOrWhiteSpace(Email) !string.IsNullOrWhiteSpace(Avatar)
? null ? Avatar
: $"https://cdn-img.gitcode.com/avatar/{Convert.ToHexString( : string.IsNullOrWhiteSpace(Email)
System.Security.Cryptography.MD5.HashData( ? null
System.Text.Encoding.UTF8.GetBytes(Email!.Trim().ToLowerInvariant()))) : $"https://cdn-img.gitcode.com/avatar/{Convert.ToHexString(
.ToLowerInvariant()}"; System.Security.Cryptography.MD5.HashData(
System.Text.Encoding.UTF8.GetBytes(Email!.Trim().ToLowerInvariant())))
public string DisplayName .ToLowerInvariant()}";
{
get
{
if (string.IsNullOrWhiteSpace(Name)) return "匿名";
return DisplayNames.TryGetValue(Name.Trim(), out var mapped) ? mapped : Name;
}
}
} }
/// <summary> /// <summary>
/// 读取 GitCode 仓库的贡献者列表(用于「关于」页面展示开发者)。 /// 读取仓库的真实贡献者:翻页拉提交记录,按作者归并统计。
/// 失败时静默返回空列表,不影响关于页其它内容。 ///
/// 为什么不用 /collaborators:Gitea 的协同者列表要求登录,且只包含被显式
/// 添加的协作者,和「谁真的写了代码」是两回事。这里直接读 /commits,
/// 统计每个人真实的提交数,失败时静默返回空列表,不影响关于页其它内容。
/// </summary> /// </summary>
public static class ContributorsService public static class ContributorsService
{ {
private const int PageSize = 50;
private const int MaxPages = 12;
private const int MaxShown = 8;
private static readonly TimeSpan CacheTtl = TimeSpan.FromMinutes(10);
private static readonly HttpClient Http = CreateHttp(); private static readonly HttpClient Http = CreateHttp();
/// <summary>同一作者的多个 git 身份 -> 统一展示名。</summary>
private static readonly Dictionary<string, string> Aliases = new(StringComparer.OrdinalIgnoreCase)
{
["morris"] = "Morris",
["morris_1"] = "Morris",
["2509_92447106"] = "Morris",
["chenmoyuan1214@qq.com"] = "Morris",
["morris@xhmcl.com"] = "Morris",
};
/// <summary>自动化提交(CI / 助手账号),不计入开发者。</summary>
private static readonly HashSet<string> IgnoredEmails = new(StringComparer.OrdinalIgnoreCase)
{
"agent@teamily.ai",
};
private static readonly object Gate = new();
private static (DateTimeOffset At, string Key, List<Contributor> Items)? _cache;
private static HttpClient CreateHttp() private static HttpClient CreateHttp()
{ {
var c = new HttpClient { Timeout = TimeSpan.FromSeconds(10) }; var c = new HttpClient { Timeout = TimeSpan.FromSeconds(10) };
@@ -59,48 +80,172 @@ public static class ContributorsService
return c; return c;
} }
/// <summary>默认仓库的 contributors 接口地址。</summary> /// <summary>按仓库地址推导接口:Xhmcl(Gitea) 与 GitCode 结构不同。</summary>
public static string BuildUrl(string repository) public static string BuildUrl(string repository)
{ {
var raw = string.IsNullOrWhiteSpace(repository) var raw = string.IsNullOrWhiteSpace(repository)
? SourcePreset.GitCode.HomeUrl : repository.Trim(); ? SourcePreset.Xhmcl.HomeUrl : repository.Trim();
if (!Uri.TryCreate(raw, UriKind.Absolute, out var uri)) if (!Uri.TryCreate(raw, UriKind.Absolute, out var uri))
return "https://api.gitcode.com/api/v5/repos/Morris_1/GC/contributors"; return "https://git.xhmcl.com/api/v1/repos/Morris/GC/commits";
var parts = uri.AbsolutePath.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries); var parts = uri.AbsolutePath.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries);
if (parts.Length < 2) if (parts.Length < 2)
return "https://api.gitcode.com/api/v5/repos/Morris_1/GC/contributors"; return "https://git.xhmcl.com/api/v1/repos/Morris/GC/commits";
var repo = parts[1].EndsWith(".git", StringComparison.OrdinalIgnoreCase) var repo = parts[1].EndsWith(".git", StringComparison.OrdinalIgnoreCase)
? parts[1][..^4] : parts[1]; ? parts[1][..^4] : parts[1];
return $"https://api.gitcode.com/api/v5/repos/{parts[0]}/{repo}/contributors";
// GitCode 的实现在仓库仍指向 gitcode.com 时才走它。
if (uri.Host.Contains("gitcode.com", StringComparison.OrdinalIgnoreCase))
return $"https://api.gitcode.com/api/v5/repos/{parts[0]}/{repo}/contributors";
return $"https://{uri.Host}/api/v1/repos/{parts[0]}/{repo}/commits";
} }
public static async Task<List<Contributor>> FetchAsync(string repository, CancellationToken ct = default) public static async Task<List<Contributor>> FetchAsync(string repository, CancellationToken ct = default)
{ {
var url = BuildUrl(repository); var url = BuildUrl(repository);
lock (Gate)
{
if (_cache is { } hit && hit.Key == url && DateTimeOffset.UtcNow - hit.At < CacheTtl)
return hit.Items;
}
List<Contributor> list;
try try
{ {
using var timeout = CancellationTokenSource.CreateLinkedTokenSource(ct); using var timeout = CancellationTokenSource.CreateLinkedTokenSource(ct);
timeout.CancelAfter(TimeSpan.FromSeconds(10)); timeout.CancelAfter(TimeSpan.FromSeconds(15));
var text = await Http.GetStringAsync(url, timeout.Token); list = url.Contains("api.gitcode.com", StringComparison.OrdinalIgnoreCase)
var trimmed = text.TrimStart(); ? await FetchFromGitCodeAsync(url, timeout.Token)
if (trimmed.Length == 0 || trimmed[0] != '[') return new List<Contributor>(); : await FetchFromCommitsAsync(url, timeout.Token);
var list = JsonSerializer.Deserialize<List<Contributor>>(text, new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true
}) ?? new List<Contributor>();
// 按提交数从多到少,贡献最多的排最前
list.Sort((a, b) => b.Contributions.CompareTo(a.Contributions));
return list;
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.Error.WriteLine($"读取贡献者失败: {ex.Message}"); Console.Error.WriteLine($"读取贡献者失败: {ex.Message}");
return new List<Contributor>(); return new List<Contributor>();
} }
lock (Gate) _cache = (DateTimeOffset.UtcNow, url, list);
return list;
} }
/// <summary>Gitea:翻页读提交记录并归并作者。</summary>
private static async Task<List<Contributor>> FetchFromCommitsAsync(string commitUrl, CancellationToken ct)
{
var byKey = new Dictionary<string, Contributor>(StringComparer.OrdinalIgnoreCase);
for (var page = 1; page <= MaxPages; page++)
{
var url = $"{commitUrl}?limit={PageSize}&page={page}&stat=false";
var text = await Http.GetStringAsync(url, ct);
using var doc = JsonDocument.Parse(text);
if (doc.RootElement.ValueKind != JsonValueKind.Array) break;
var seen = 0;
foreach (var item in doc.RootElement.EnumerateArray())
{
seen++;
string? login = null, name = null, email = null, avatar = null;
DateTimeOffset? date = null;
if (item.TryGetProperty("author", out var author) &&
author.ValueKind == JsonValueKind.Object)
{
login = author.TryGetProperty("login", out var l) ? l.GetString() : null;
avatar = author.TryGetProperty("avatar_url", out var a) ? a.GetString() : null;
}
if (item.TryGetProperty("commit", out var commit) &&
commit.TryGetProperty("author", out var ca) &&
ca.ValueKind == JsonValueKind.Object)
{
name = ca.TryGetProperty("name", out var n) ? n.GetString() : null;
email = ca.TryGetProperty("email", out var e) ? e.GetString() : email;
if (ca.TryGetProperty("date", out var d) &&
DateTimeOffset.TryParse(d.GetString(), out var parsed))
date = parsed;
}
Add(byKey, login, name, email, avatar, date);
}
if (seen < PageSize) break;
}
return Sort(byKey.Values);
}
/// <summary>GitCode:contributors 接口直接返回贡献数与邮箱。</summary>
private static async Task<List<Contributor>> FetchFromGitCodeAsync(string url, CancellationToken ct)
{
var text = await Http.GetStringAsync(url, ct);
if (text.TrimStart().Length == 0 || text.TrimStart()[0] != '[')
return new List<Contributor>();
var byKey = new Dictionary<string, Contributor>(StringComparer.OrdinalIgnoreCase);
using var doc = JsonDocument.Parse(text);
foreach (var item in doc.RootElement.EnumerateArray())
{
var name = item.TryGetProperty("name", out var n) ? n.GetString() : null;
var email = item.TryGetProperty("email", out var e) ? e.GetString() : null;
var count = item.TryGetProperty("contributions", out var c) && c.TryGetInt32(out var v) ? v : 1;
var contributor = Add(byKey, null, name, email, null, null, count);
if (contributor != null) contributor.Contributions = Math.Max(contributor.Contributions, count);
}
return Sort(byKey.Values);
}
private static Contributor? Add(
Dictionary<string, Contributor> byKey,
string? login, string? name, string? email, string? avatar, DateTimeOffset? date,
int weight = 1)
{
if (!string.IsNullOrWhiteSpace(email) && IgnoredEmails.Contains(email.Trim()))
return null;
var (key, display) = Resolve(login, name, email);
if (!byKey.TryGetValue(key, out var contributor))
{
contributor = new Contributor { Name = display };
byKey[key] = contributor;
}
contributor.Contributions += weight;
if (string.IsNullOrWhiteSpace(contributor.Email) && !string.IsNullOrWhiteSpace(email))
contributor.Email = email;
if (string.IsNullOrWhiteSpace(contributor.Avatar) && !string.IsNullOrWhiteSpace(avatar))
contributor.Avatar = avatar;
if (date.HasValue && (contributor.LastCommit == null || date > contributor.LastCommit))
contributor.LastCommit = date;
return contributor;
}
/// <summary>把同一个人在不同时期的 git 身份归并到同一个展示名。</summary>
private static (string Key, string Display) Resolve(string? login, string? name, string? email)
{
foreach (var raw in new[] { login, name, email })
{
if (string.IsNullOrWhiteSpace(raw)) continue;
if (Aliases.TryGetValue(raw.Trim(), out var display))
return ("#" + display.ToLowerInvariant(), display);
}
var label = !string.IsNullOrWhiteSpace(login) ? login!
: !string.IsNullOrWhiteSpace(name) ? name!
: email!;
return (label.Trim().ToLowerInvariant(), label.Trim());
}
private static List<Contributor> Sort(IEnumerable<Contributor> items) =>
items
.OrderByDescending(c => c.Contributions)
.ThenByDescending(c => c.LastCommit ?? DateTimeOffset.MinValue)
.ThenBy(c => c.Name, StringComparer.OrdinalIgnoreCase)
.Take(MaxShown)
.ToList();
} }
+8 -8
View File
@@ -18,10 +18,11 @@ public sealed class SettingsService
public void Load() public void Load()
{ {
Current = Json.Read<AppSettings>(_paths.SettingsFile) ?? new AppSettings(); Current = Json.Read<AppSettings>(_paths.SettingsFile) ?? new AppSettings();
if (Current.UpdateRepository.Contains("gitcode.com/2509_92447106/GC", StringComparison.OrdinalIgnoreCase))
// 暂时停用 GitCode:旧配置里的 GitCode 仓库地址统一迁到 Xhmcl。
if (Current.UpdateRepository.Contains("gitcode.com", StringComparison.OrdinalIgnoreCase))
{ {
Current.UpdateRepository = Current.UpdateRepository.Replace( Current.UpdateRepository = SourcePreset.Xhmcl.HomeUrl;
"2509_92447106", "Morris_1", StringComparison.OrdinalIgnoreCase);
Save(); Save();
} }
SeedDefaultSource(); SeedDefaultSource();
@@ -29,12 +30,11 @@ public sealed class SettingsService
} }
/// <summary> /// <summary>
/// 只允许两个内置源:Xhmcl 与 GitCode(同一份仓库的两个镜像)。 /// 当前只启用 Xhmcl 一个内置源。GitCode 的定义与下载实现保留在代码里,
/// 不再支持用户自定义源 —— 每次加载都把 Sources 规整成这两条, /// 但不再参与测速 / 下载 / 更新;恢复时把 GitCode 加回 <see cref="SourcePreset.All"/> 即可。
/// 老配置里的自定义源会被清理掉。
/// </summary> /// </summary>
public const string DefaultSourceId = "gitcode"; public const string DefaultSourceId = "xhmcl";
public const string DefaultSourceUrl = "https://gitcode.com/Morris_1/GC"; public const string DefaultSourceUrl = "https://git.xhmcl.com/Morris/GC";
private void SeedDefaultSource() private void SeedDefaultSource()
{ {
+16 -9
View File
@@ -5,10 +5,11 @@ using System.Linq;
namespace GC.Services; namespace GC.Services;
/// <summary> /// <summary>
/// 内置下载源。只允许这两个,不再支持用户自定义源。 /// 内置下载源。
/// ///
/// 两个源的内容是同一份仓库(同一个 version.json、同一批模型), /// 目前只启用 Xhmcl;GitCode 的 preset 与下载实现仍保留在代码中,
/// 区别只是**托管在哪台服务器**上;启动时探测两者延迟,取快的那个下载。 /// 但不参与测速 / 下载 / 更新。两个源本来指向同一份仓库内容,
/// 区别只是托管服务器;恢复双源时把 GitCode 加回 <see cref="All"/>。
/// </summary> /// </summary>
public sealed class SourcePreset public sealed class SourcePreset
{ {
@@ -63,17 +64,23 @@ public sealed class SourcePreset
Branch = "main" Branch = "main"
}; };
public static readonly SourcePreset[] All = { Xhmcl, GitCode }; /// <summary>
/// 当前启用的源:暂时只保留 Xhmcl。GitCode 的定义与实现仍保留在代码里,
/// 但不参与测速、下载与更新(需要恢复时把 GitCode 加回这个数组即可)。
/// </summary>
public static readonly SourcePreset[] All = { Xhmcl };
public static SourcePreset? Find(string? id) => public static SourcePreset? Find(string? id) =>
All.FirstOrDefault(p => string.Equals(p.Id, id, StringComparison.OrdinalIgnoreCase)); All.FirstOrDefault(p => string.Equals(p.Id, id, StringComparison.OrdinalIgnoreCase));
/// <summary>把任意仓库地址映射到这两个内置源之一(用于兼容旧配置)。</summary> /// <summary>把任意仓库地址映射到启用的内置源(用于兼容旧配置)。</summary>
public static SourcePreset Detect(string? url) public static SourcePreset Detect(string? url)
{ {
if (string.IsNullOrWhiteSpace(url)) return GitCode; if (!string.IsNullOrWhiteSpace(url) &&
var u = url!.ToLowerInvariant(); url!.Contains("xhmcl.com", StringComparison.OrdinalIgnoreCase))
if (u.Contains("xhmcl.com")) return Xhmcl; return Xhmcl;
return GitCode;
// 旧配置里的 GitCode 地址不再作为下载源,统一落到 Xhmcl。
return Xhmcl;
} }
} }
+3 -1
View File
@@ -310,8 +310,10 @@ internal static class Program
/// <summary>序列化清单并用私钥签名(测试里模拟一次正式发布)。</summary> /// <summary>序列化清单并用私钥签名(测试里模拟一次正式发布)。</summary>
private static void WriteSigned(string path, RepoVersion version, ECDsa key) private static void WriteSigned(string path, RepoVersion version, ECDsa key)
{ {
// keyId 必须与 .signing/ 里的私钥对应的公钥条目一致,否则客户端按 keyId
// 查不到受信任公钥,会判成 Invalid 而不是 Verified。
var text = JsonSerializer.Serialize(version, Json.Options) + "\n"; var text = JsonSerializer.Serialize(version, Json.Options) + "\n";
File.WriteAllText(path, ManifestSignature.SignDocument(text, key, "gc-2026-11")); File.WriteAllText(path, ManifestSignature.SignDocument(text, key, "gc-2026-12"));
} }
private static void CopyTree(string src, string dst) private static void CopyTree(string src, string dst)
+14 -3
View File
@@ -135,12 +135,23 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run
### 签名密钥 ### 签名密钥
- 私钥:`.signing/gc-signing.pem`(**已在 `.gitignore`,永不入库**;请自行备份) - 私钥:`.signing/gc-signing.pem`(**已在 `.gitignore`,永不入库**;请自行备份)
- 公钥:硬编码在 `GC/src/Security/SignatureKeyring.cs`,指纹 `b41b1dd6259ea9ed` - 公钥:硬编码在 `GC/src/Security/SignatureKeyring.cs`
- 生成新密钥:`dotnet run --project GC-SAVEDOG -- keygen` - 当前生效:`gc-2026-12`,指纹 `ee6083be47a87907`
- 轮换:把新公钥追加进 `SignatureKeyring.Keys`(保留旧公钥一个版本周期),再重新签名清单 - 已停用:`gc-2026-11`,指纹 `b41b1dd6259ea9ed`(私钥遗失,仅保留占位)
- 生成新密钥:`dotnet run --project GC-SAVEDOG -- keygen --key-id gc-YYYY-MM`
- 轮换:把新公钥追加进 `SignatureKeyring.Keys`(保留旧公钥一个版本周期),
同时把 `GC_SIGNING_KEY_ID`(默认值在 `buildsh/lib/build_funcs.sh`)改成新 keyId,
再重新签名清单
- 部署前核对两边公钥一致: - 部署前核对两边公钥一致:
`dotnet run --project GC-SAVEDOG -- verify --manifest version.json` `dotnet run --project GC-SAVEDOG -- verify --manifest version.json`
`build.sh` 在刷新清单后自动调用 `sign_manifest` 签名并同步 `model/version.json`;
`.signing/gc-signing.pem` 不存在时只告警,清单不带签名(客户端会拒绝更新)。
> 换钥匙的代价:老客户端只认识编译进去的那份公钥,所以**用新密钥签出的清单
> 在旧版本上会判成「签名无效」**。密钥一旦丢失,只能靠发一个新版本把新公钥带出去,
> 中间这段时间老客户端无法自动更新 —— 私钥务必备份两处以上。
### zip 解压加固 ### zip 解压加固
更新包和模型源 zip 一律当成不可信输入:拒绝 `../`、绝对路径、盘符、UNC、符号链接; 更新包和模型源 zip 一律当成不可信输入:拒绝 `../`、绝对路径、盘符、UNC、符号链接;
+1 -1
View File
@@ -275,7 +275,7 @@ function New-MacAppBundle {
<plist version="1.0"><dict> <plist version="1.0"><dict>
<key>CFBundleName</key><string>GC</string> <key>CFBundleName</key><string>GC</string>
<key>CFBundleDisplayName</key><string>GC</string> <key>CFBundleDisplayName</key><string>GC</string>
<key>CFBundleIdentifier</key><string>cn.neorf.GC</string> <key>CFBundleIdentifier</key><string>com.xhmcl.GC</string>
<key>CFBundleVersion</key><string>$script:BuildVersion</string> <key>CFBundleVersion</key><string>$script:BuildVersion</string>
<key>CFBundleShortVersionString</key><string>$script:BuildVersion</string> <key>CFBundleShortVersionString</key><string>$script:BuildVersion</string>
<key>CFBundlePackageType</key><string>APPL</string> <key>CFBundlePackageType</key><string>APPL</string>
+21
View File
@@ -39,12 +39,33 @@ bs_build() {
progress_step "编译 Mac" progress_step "编译 Mac"
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1 _run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1
publish_backend "osx-arm64" "dist/mac-arm64" || return 1
# Flutter 的 macOS 产物只能在 macOS 上编;交叉构建时跳过,包内回退内置界面
if [ "$(uname -s)" = "Darwin" ]; then
build_flutter_ui macos "dist/mac-arm64" || return 1
fi
progress_step "编译 Win-x64" progress_step "编译 Win-x64"
_run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1 _run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1
publish_backend "win-x64" "dist/win-amd64" || return 1
progress_step "编译 Win-arm64" progress_step "编译 Win-arm64"
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1 _run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
publish_backend "win-arm64" "dist/win-arm64" || return 1
# Windows 前端:Windows 主机走官方 toolchain;Linux/macOS 主机用 mingw-w64 +
# wine 交叉编译(buildsh/cross)。只产出 x64 一份,两个包共用,
# ARM64 上由系统模拟 x64 进程运行前端。
case "$(uname -s)" in
MINGW*|MSYS*|CYGWIN*) build_flutter_ui windows "dist/win-flutter" || return 1 ;;
*) build_flutter_ui_cross "dist/win-flutter" ;;
esac
if [ -d "$ROOT_DIR/dist/win-flutter" ]; then
for label in win-amd64 win-arm64; do
cp -R "$ROOT_DIR/dist/win-flutter/." "$ROOT_DIR/dist/$label/"
done
rm -rf "$ROOT_DIR/dist/win-flutter"
fi
progress_step "运行骨架"; progress_tick 100 progress_step "运行骨架"; progress_tick 100
package_mac_app package_mac_app
+108
View File
@@ -0,0 +1,108 @@
cmake_minimum_required(VERSION 3.14)
# 交叉编译 Flutter Windows 桌面外壳。
#
# 只编译 C++ 层:runner(Win32 窗口)+ cpp_client_wrapper(Dart 互操作)。
# Dart 侧的 flutter_assets 由 flutter assemble 单独产出,最后与
# flutter_windows.dll 一起摆进同一个目录就是完整的可运行包。
#
# 与 windows/CMakeLists.txt 的区别:不调用 tool_backend.bat(它在非 Windows
# 上不可执行),也不依赖 Visual Studio 生成器。
project(gc_ui_cross LANGUAGES CXX RC)
get_filename_component(APP_DIR "${CMAKE_CURRENT_LIST_DIR}/../../GC-UI/frontend" ABSOLUTE)
set(WIN_DIR "${APP_DIR}/windows")
set(RUN_DIR "${WIN_DIR}/runner")
set(EPHEMERAL "${WIN_DIR}/flutter/ephemeral")
set(WRAPPER "${EPHEMERAL}/cpp_client_wrapper")
set(DLL_LIB "${EPHEMERAL}/flutter_windows.dll.lib")
foreach(required
"${EPHEMERAL}/flutter_windows.dll"
"${DLL_LIB}"
"${WRAPPER}/core_implementations.cc")
if(NOT EXISTS "${required}")
message(FATAL_ERROR
"缺少 Flutter Windows 引擎产物:${required}\n"
"先运行 buildsh/cross/build-ui-win-cross.sh 里的 fetch_engine 步骤。")
endif()
endforeach()
set(FLUTTER_VERSION "1.0.0" CACHE STRING "写入 exe 版本资源")
# windres 在非 Windows 主机上不按 rc 文件所在目录解析图标路径,
# 这里把 resources\\app_icon.ico 换成绝对路径再交给 windres。
# 注意只替换这一处:rc 里其它 "\0" 是字符串转义,不能动。
file(READ "${RUN_DIR}/Runner.rc" _rc_text)
string(REPLACE "resources\\\\app_icon.ico" "${RUN_DIR}/resources/app_icon.ico" _rc_text "${_rc_text}")
# windres 收到 -DFLUTTER_VERSION=\"1.0.0\" 时会把反斜杠留在宏值里,展开成非法 token。
# 直接把宏定义成字面量,绕开命令行转义。
string(REPLACE "#define VERSION_AS_STRING FLUTTER_VERSION"
"#define VERSION_AS_STRING \"${FLUTTER_VERSION}\""
_rc_text "${_rc_text}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc" "${_rc_text}")
add_executable(${BINARY_NAME} WIN32
"${RUN_DIR}/main.cpp"
"${RUN_DIR}/flutter_window.cpp"
"${RUN_DIR}/utils.cpp"
"${RUN_DIR}/win32_window.cpp"
"${WIN_DIR}/flutter/generated_plugin_registrant.cc"
"${WRAPPER}/core_implementations.cc"
"${WRAPPER}/standard_codec.cc"
"${WRAPPER}/plugin_registrar.cc"
"${WRAPPER}/flutter_engine.cc"
"${WRAPPER}/flutter_view_controller.cc"
"${CMAKE_CURRENT_BINARY_DIR}/Runner.cross.rc"
)
target_include_directories(${BINARY_NAME} PRIVATE
"${RUN_DIR}"
"${WIN_DIR}"
"${EPHEMERAL}"
"${EPHEMERAL}/include"
"${WRAPPER}/include"
)
target_compile_features(${BINARY_NAME} PRIVATE cxx_std_17)
# Flutter 的 C++ wrapper 需要 RTTI 与异常;线程安全相关的锁依赖 posix 线程模型。
target_compile_options(${BINARY_NAME} PRIVATE
-fexceptions
-frtti
-Wall
-Wno-unused-parameter
-Wno-missing-field-initializers
)
# Runner.rc 里的 #include "resource.h" / runner.exe.manifest 都是相对路径,
# windres 不按源文件目录解析,必须显式给 -I。
set_source_files_properties("${RUN_DIR}/Runner.rc" PROPERTIES
COMPILE_FLAGS "-I\"${RUN_DIR}\"")
target_compile_definitions(${BINARY_NAME} PRIVATE
"FLUTTER_VERSION=\"${FLUTTER_VERSION}\""
"FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}"
"FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}"
"FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}"
"FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}"
"NOMINMAX"
)
target_link_libraries(${BINARY_NAME} PRIVATE
"${DLL_LIB}"
dwmapi
ole32
uuid
)
# runner 的入口是 wWinMain(宽字符版);MSVC 自动处理,mingw 需要 -municode
# 才会链接 wWinMainCRTStartup,否则报 undefined reference to `WinMain'。
target_link_options(${BINARY_NAME} PRIVATE -municode)
set_target_properties(${BINARY_NAME} PROPERTIES
OUTPUT_NAME "GC-UI"
SUFFIX ".exe"
)
+221
View File
@@ -0,0 +1,221 @@
#!/usr/bin/env bash
#
# 在 Linux / macOS 上交叉编译 Flutter Windows 桌面界面(GC-UI)。
#
# ./buildsh/cross/build-ui-win-cross.sh [输出目录]
#
# 产物目录是可直接拷到 Windows 上运行的一整套:
# GC-UI.exe flutter_windows.dll data/{icudtl.dat,app.so,flutter_assets/}
#
# 原理:
# Flutter 的 Windows 外壳(runner + cpp_client_wrapper)是纯 Win32 + 标准 C++,
# 只通过 C ABI 调 flutter_windows.dll,所以 mingw-w64 就能编译。
# 唯一的 Windows 专属步骤是 AOT 快照生成(gen_snapshot.exe 是 PE 文件),
# 用 wine 执行即可,全流程不需要 Windows 机器或 MSVC。
#
# 依赖:
# Linux sudo apt install mingw-w64 cmake ninja-build wine unzip curl
# macOS brew install mingw-w64 cmake ninja && brew install --cask wine-stable
#
# 环境变量:
# FLUTTER_BIN flutter 可执行文件(默认 PATH 中的 flutter,要求 3.24+)
# WIN_ENGINE_MIRROR 引擎产物来源(默认官方 GCS,国内可换 storage.flutter-io.cn)
#
set -euo pipefail
ROOT_DIR=$(cd "$(dirname "$0")/../.." && pwd)
UI_DIR="$ROOT_DIR/GC-UI/frontend"
OUT_DIR="${1:-$UI_DIR/build/windows/x64/runner/Release}"
BUILD_DIR="$UI_DIR/build/windows/x64/cross"
say() { printf '\033[36m==>\033[0m %s\n' "$*"; }
warn() { printf '\033[33m!!\033[0m %s\n' "$*"; }
die() { printf '\033[31mxx\033[0m %s\n' "$*" >&2; exit 1; }
need() { command -v "$1" >/dev/null 2>&1 || die "缺少 $1($2)"; }
# ---------------------------------------------------------------- 工具链
MINGW_CXX=""
check_toolchain() {
need cmake "Linux: apt install cmake;macOS: brew install cmake"
need ninja "Linux: apt install ninja-build;macOS: brew install ninja"
need unzip "Linux: apt install unzip"
need curl "Linux: apt install curl"
for c in x86_64-w64-mingw32-g++-posix x86_64-w64-mingw32-g++; do
if command -v "$c" >/dev/null 2>&1; then MINGW_CXX="$c"; break; fi
done
[ -n "$MINGW_CXX" ] || die "缺少 mingw-w64 C++ 编译器
Linux: sudo apt install g++-mingw-w64-x86-64-posix
macOS: brew install mingw-w64"
command -v x86_64-w64-mingw32-windres >/dev/null 2>&1 || die "缺少 mingw-w64 资源编译器"
# gen_snapshot.exe 靠 wine 执行;没有 wine 就只能出 debug 版(JIT)
if command -v wine >/dev/null 2>&1 || command -v wine64 >/dev/null 2>&1; then
WINE_BIN=$(command -v wine 2>/dev/null || command -v wine64)
else
die "缺少 wine(AOT 快照需要执行 Windows 版 gen_snapshot.exe)
Linux: sudo apt install wine
macOS: brew install --cask wine-stable"
fi
}
# ---------------------------------------------------------------- Flutter
resolve_flutter() {
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
command -v "$FLUTTER_BIN" >/dev/null 2>&1 || die "未找到 flutter,可设置 FLUTTER_BIN=/path/to/flutter"
local bin_path root target
bin_path=$(command -v "$FLUTTER_BIN")
while [ -L "$bin_path" ]; do
target=$(readlink "$bin_path")
case "$target" in
/*) bin_path="$target" ;;
*) bin_path="$(cd "$(dirname "$bin_path")" && pwd)/$target" ;;
esac
done
root=$(cd "$(dirname "$bin_path")/.." && pwd)
[ -f "$root/bin/internal/engine.version" ] || die "$root 不像 Flutter SDK 根目录"
FLUTTER_ROOT="$root"
ENGINE_DIR="$root/bin/cache/artifacts/engine"
ENGINE_HASH=$(tr -d '[:space:]' < "$root/bin/internal/engine.version")
# pubspec 要求 Dart 3.5+(Flutter 3.24+),版本不对直接提醒
local dart_ver
dart_ver=$("$root/bin/cache/dart-sdk/bin/dart" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1) || dart_ver=""
say "Flutter SDK: $root(engine ${ENGINE_HASH:0:10}${dart_ver:+, dart $dart_ver})"
}
# ---------------------------------------------------------------- 引擎产物
ENGINE_DIR="" # 由 resolve_flutter 填充
fetch_engine() {
local base="$MIRROR/flutter/$ENGINE_HASH"
local cache="${TMPDIR:-/tmp}/gc-win-engine"
mkdir -p "$cache"
# 每个条目:远端相对路径 | 落地目录 | 落地后的标志文件
local -a items=(
"windows-x64-release/windows-x64-flutter.zip|$ENGINE_DIR/windows-x64-release|flutter_windows.dll.lib"
"windows-x64/artifacts.zip|$ENGINE_DIR/windows-x64|frontend_server_aot.dart.snapshot"
"windows-x64/flutter-cpp-client-wrapper.zip|$ENGINE_DIR/windows-x64/cpp_client_wrapper|core_implementations.cc"
)
local item remote dest marker zip
for item in "${items[@]}"; do
IFS='|' read -r remote dest marker <<<"$item"
[ -f "$dest/$marker" ] && continue
zip="$cache/$(echo "$remote" | tr '/' '_')"
if [ ! -s "$zip" ]; then
say "下载 $(basename "$remote")"
curl -fL --retry 3 --retry-delay 2 -o "$zip.part" "$base/$remote" \
|| die "下载失败:$base/$remote
可设置 WIN_ENGINE_MIRROR=https://storage.flutter-io.cn/flutter_infra_release 走国内镜像"
mv "$zip.part" "$zip"
fi
mkdir -p "$dest"
unzip -oq "$zip" -d "$dest"
done
install_gen_snapshot_shim
}
# flutter_tools 会直接 exec $ENGINE_DIR/*/gen_snapshot(无 .exe 后缀)。
# 这里放一个调用 wine 的同名脚本,并给原本的 exe 加上 .win 后缀避免混淆。
install_gen_snapshot_shim() {
local dirs=("$ENGINE_DIR/windows-x64-release" "$ENGINE_DIR/windows-x64")
local dir shim
for dir in "${dirs[@]}"; do
[ -f "$dir/gen_snapshot.exe" ] || continue
[ -f "$dir/gen_snapshot.exe.win" ] || mv "$dir/gen_snapshot.exe" "$dir/gen_snapshot.exe.win"
shim="$dir/gen_snapshot"
cat > "$shim" <<EOF
#!/bin/sh
# 由 buildsh/cross/build-ui-win-cross.sh 生成:用 wine 执行 Windows 版 gen_snapshot。
export WINEPREFIX="\${WINEPREFIX:-\$HOME/.wine64}"
export WINEDEBUG=-all
exec "$WINE_BIN" "$dir/gen_snapshot.exe.win" "\$@"
EOF
chmod +x "$shim"
done
}
# ---------------------------------------------------------------- 构建
build_assets_and_aot() {
say "生成 Dart 资源与 AOT 快照"
( cd "$UI_DIR" && "$FLUTTER_BIN" --no-version-check --suppress-analytics pub get >/dev/null )
local dart="$FLUTTER_ROOT/bin/cache/dart-sdk/bin/dart"
local tool="$FLUTTER_ROOT/packages/flutter_tools/bin/tool_backend.dart"
# tool_backend 是官方 CMake 调用的同一入口:解包引擎产物到 ephemeral、
# 生成 flutter_assets、aot_elf_release。它末尾的收尾步骤在非 Windows host
# 上可能非零退出,所以只校验产物是否齐备。
( cd "$UI_DIR" && \
FLUTTER_ROOT="$FLUTTER_ROOT" \
PROJECT_DIR="$UI_DIR" \
FLUTTER_STORAGE_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-$MIRROR}" \
"$dart" "$tool" windows-x64 release ) || true
[ -f "$UI_DIR/build/windows/app.so" ] || die "AOT 快照未生成(wine 执行 gen_snapshot 失败?)"
[ -d "$UI_DIR/build/flutter_assets" ] || die "flutter_assets 未生成"
say "AOT 快照 $(du -h "$UI_DIR/build/windows/app.so" | cut -f1),资源 $(du -sh "$UI_DIR/build/flutter_assets" | cut -f1)"
}
build_cpp() {
local ver major minor patch build_no
read -r major minor patch build_no <<<"$(sed -n 's/^version:[[:space:]]*//p' "$UI_DIR/pubspec.yaml" \
| head -1 | awk -F'[.+]' '{print $1+0, $2+0, $3+0, ($4==""?0:$4+0)}')"
ver="${major}.${minor}.${patch}"
say "编译 C++ 外壳($(basename "$MINGW_CXX"))"
cmake -S "$ROOT_DIR/buildsh/cross" -B "$BUILD_DIR" -G Ninja \
-DCMAKE_TOOLCHAIN_FILE="$ROOT_DIR/buildsh/cross/toolchain-mingw.cmake" \
-DCMAKE_BUILD_TYPE=Release \
-DBINARY_NAME=GC-UI \
-DFLUTTER_VERSION="$ver" \
-DFLUTTER_VERSION_MAJOR="$major" \
-DFLUTTER_VERSION_MINOR="$minor" \
-DFLUTTER_VERSION_PATCH="$patch" \
-DFLUTTER_VERSION_BUILD="$build_no" >/dev/null
cmake --build "$BUILD_DIR" -- -j "$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)" \
|| die "C++ 编译失败"
[ -f "$BUILD_DIR/GC-UI.exe" ] || die "未产出 GC-UI.exe"
}
stage() {
local eph="$UI_DIR/windows/flutter/ephemeral"
say "组装到 $OUT_DIR"
rm -rf "$OUT_DIR"
mkdir -p "$OUT_DIR/data"
cp "$BUILD_DIR/GC-UI.exe" "$OUT_DIR/"
cp "$eph/flutter_windows.dll" "$OUT_DIR/"
cp "$eph/icudtl.dat" "$OUT_DIR/data/"
cp "$UI_DIR/build/windows/app.so" "$OUT_DIR/data/"
cp -R "$UI_DIR/build/flutter_assets/." "$OUT_DIR/data/flutter_assets/"
say "完成:$(du -sh "$OUT_DIR" | cut -f1)"
find "$OUT_DIR" -maxdepth 2 -mindepth 1 | sed "s|$OUT_DIR| .|"
}
# ---------------------------------------------------------------- main
MIRROR="${WIN_ENGINE_MIRROR:-https://storage.googleapis.com/flutter_infra_release}"
check_toolchain
resolve_flutter
fetch_engine
build_assets_and_aot
build_cpp
stage
+36
View File
@@ -0,0 +1,36 @@
# 在 Linux / macOS 上交叉编译 Flutter Windows 桌面应用的 CMake 工具链。
#
# 原理:Flutter 的 Windows 嵌入层(windows/runner/*.cpp + cpp_client_wrapper)
# 是纯 Win32 + 标准 C++,只通过 C ABI 调用 flutter_windows.dll。因此用
# mingw-w64(GCC,posix 线程模型)即可产出与官方 toolchain 等价的 PE 产物,
# 不需要 Windows 机器,也不需要 MSVC。
#
# 用法:
# cmake -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE=.../toolchain-mingw.cmake ...
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_VERSION 10.0)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(MINGW_PREFIX "x86_64-w64-mingw32" CACHE STRING "目标三元组前缀")
# 必须用 posix 线程模型:Flutter 的 C++ wrapper 依赖 std::mutex / std::thread,
# win32 线程模型下的 libstdc++ 不提供这些类型。
find_program(MINGW_C NAMES ${MINGW_PREFIX}-gcc-posix ${MINGW_PREFIX}-gcc REQUIRED)
find_program(MINGW_CXX NAMES ${MINGW_PREFIX}-g++-posix ${MINGW_PREFIX}-g++ REQUIRED)
find_program(MINGW_RC NAMES ${MINGW_PREFIX}-windres REQUIRED)
set(CMAKE_C_COMPILER "${MINGW_C}")
set(CMAKE_CXX_COMPILER "${MINGW_CXX}")
set(CMAKE_RC_COMPILER "${MINGW_RC}")
set(CMAKE_FIND_ROOT_PATH "/usr/${MINGW_PREFIX}")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
# 静态链接 libgcc / libstdc++ / winpthread,产物只依赖 flutter_windows.dll
# 和系统 DLL,拷到干净机器上也能跑。
set(CMAKE_CXX_FLAGS_INIT "-DUNICODE -D_UNICODE -DNOMINMAX -D_HAS_EXCEPTIONS=1")
set(CMAKE_EXE_LINKER_FLAGS_INIT "-static -static-libgcc -static-libstdc++")
+90 -10
View File
@@ -24,7 +24,7 @@ stamp_launcher_only() {
# 没有私钥时只警告:清单不带 signature,客户端会按「未签名」处理。 # 没有私钥时只警告:清单不带 signature,客户端会按「未签名」处理。
sign_manifest() { sign_manifest() {
KEY="$ROOT_DIR/.signing/gc-signing.pem" KEY="$ROOT_DIR/.signing/gc-signing.pem"
KEYID="${GC_SIGNING_KEY_ID:-gc-2026-11}" KEYID="${GC_SIGNING_KEY_ID:-gc-2026-12}"
if [ ! -f "$KEY" ]; then if [ ! -f "$KEY" ]; then
echo "!! 未找到签名私钥 ${KEY},本次 version.json 未签名(客户端会拒绝更新)" echo "!! 未找到签名私钥 ${KEY},本次 version.json 未签名(客户端会拒绝更新)"
echo " 生成密钥:dotnet run --project GC-SAVEDOG -- keygen" echo " 生成密钥:dotnet run --project GC-SAVEDOG -- keygen"
@@ -174,32 +174,112 @@ pack_models() {
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip, # macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
# 这样 macOS 双击会用归档工具解压出可运行的 .app。 # 这样 macOS 双击会用归档工具解压出可运行的 .app。
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。 # 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
# 发布本地 UI 后端(GC.UI.Server)。启动器会拉起它并等待 /api/health,
# 模型窗口也由它承载,所以必须和启动器放在同一目录。
publish_backend() {
RID="$1"; OUT="$2"
echo "==> 编译 UI 后端 (${RID}) -> ${OUT}"
dotnet publish "$ROOT_DIR/GC-UI/backend/GC.UI.Server/GC.UI.Server.csproj" \
-c Release \
-r "$RID" \
--self-contained true \
-p:Version="$VERSION" \
-p:DebugType=none \
-p:PublishSingleFile=false \
-p:PublishTrimmed=false \
-o "$ROOT_DIR/$OUT" || return 1
}
# 当前主机原生构建 Flutter 前端(Windows 主机编 Windows,macOS 主机编 macOS)。
# macOS 版 Flutter 桌面只能在 macOS 上编;Windows 版则由 build_flutter_ui_cross
# 在 Linux/macOS 上交叉编译。
build_flutter_ui() {
PLAT="$1"; DEST="$2"
UI_SRC="$ROOT_DIR/GC-UI/frontend"
[ -d "$UI_SRC" ] || return 0
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then
echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定),本次包内不含 Flutter 界面"
return 0
fi
echo "==> 构建 Flutter 前端 (${PLAT})"
( cd "$UI_SRC" && "$FLUTTER_BIN" pub get && "$FLUTTER_BIN" build "$PLAT" --release ) || return 1
mkdir -p "$ROOT_DIR/$DEST"
case "$PLAT" in
windows)
# Release/ 里含 GC-UI.exe、flutter_windows.dll 和 data/
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/"
;;
macos)
rm -rf "$ROOT_DIR/$DEST/GC-UI.app"
cp -R "$UI_SRC/build/macos/Build/Products/Release/GC-UI.app" "$ROOT_DIR/$DEST/"
;;
esac
echo " -> $DEST(Flutter ${PLAT})"
}
# 在 Linux / macOS 上交叉编译 Windows 前端:mingw-w64 编 C++ 外壳,
# wine 跑 Windows 版 gen_snapshot 生成 AOT 快照,无需 Windows 机器。
# 产物布局与官方 toolchain 完全一致(GC-UI.exe + flutter_windows.dll + data/)。
build_flutter_ui_cross() {
DEST="$1"
UI_SRC="$ROOT_DIR/GC-UI/frontend"
[ -d "$UI_SRC" ] || return 0
FLUTTER_BIN="${FLUTTER_BIN:-flutter}"
if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then
echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定),本次包内不含 Flutter 界面"
return 0
fi
mkdir -p "$ROOT_DIR/build/logs"
echo "==> 交叉编译 Windows 前端(mingw-w64 + wine)"
if ! FLUTTER_BIN="$FLUTTER_BIN" bash "$ROOT_DIR/buildsh/cross/build-ui-win-cross.sh" \
"$UI_SRC/build/windows/x64/runner/Release" \
>"$ROOT_DIR/build/logs/flutter-win-cross.log" 2>&1; then
echo "!! 交叉编译失败,本次包内不含 Flutter 界面(日志:build/logs/flutter-win-cross.log)"
return 0
fi
mkdir -p "$ROOT_DIR/$DEST"
cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/"
echo " -> $DEST(Flutter windows,交叉编译)"
}
pack_launcher() { pack_launcher() {
echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)" echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"
# --- Windows:exe 单文件(连同 GC-SAVEDOG.exe 一起打进 zip)--- # --- Windows:启动器 + 守护进程 + UI 后端 + Flutter 前端,整目录打包 ---
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
RID="${pair%%:*}"; LABEL="${pair##*:}" RID="${pair%%:*}"; LABEL="${pair##*:}"
SRC="$ROOT_DIR/dist/$LABEL" SRC="$ROOT_DIR/dist/$LABEL"
[ -d "$SRC" ] || SRC="$ROOT_DIR/dist/$RID" # 兼容旧布局 [ -d "$SRC" ] || SRC="$ROOT_DIR/dist/$RID" # 兼容旧布局
[ -d "$SRC" ] || continue [ -d "$SRC" ] || continue
# 注意排除守护进程:GC-SAVEDOG.exe 在字典序里排在 GC.exe 前面
EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG' | head -1) # 启动器固定是 GC.exe;后端与前端是可选的随包产物,不能当成启动器。
EXE="$SRC/GC.exe"
[ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1)
[ -n "$EXE" ] || continue [ -n "$EXE" ] || continue
TMP="$ROOT_DIR/dist/.winpkg-$LABEL" TMP="$ROOT_DIR/dist/.winpkg-$LABEL"
rm -rf "$TMP"; mkdir -p "$TMP" rm -rf "$TMP"; mkdir -p "$TMP"
cp "$EXE" "$TMP/GC-${VERSION}-${LABEL}.exe" cp -R "$SRC"/. "$TMP"/
rm -f "$TMP"/*.zip
mv "$TMP/$(basename "$EXE")" "$TMP/GC-${VERSION}-${LABEL}.exe"
chmod +x "$TMP/GC-${VERSION}-${LABEL}.exe" 2>/dev/null || true chmod +x "$TMP/GC-${VERSION}-${LABEL}.exe" 2>/dev/null || true
if [ -f "$SRC/GC-SAVEDOG.exe" ]; then if [ ! -f "$TMP/GC-SAVEDOG.exe" ]; then
cp "$SRC/GC-SAVEDOG.exe" "$TMP/GC-SAVEDOG.exe"
else
echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新" echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新"
fi fi
if [ ! -f "$TMP/GC-UI.exe" ]; then
echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面"
fi
ZIP="$ROOT_DIR/dist/$LABEL/GC-${VERSION}-${LABEL}.zip" ZIP="$ROOT_DIR/dist/$LABEL/GC-${VERSION}-${LABEL}.zip"
rm -f "$ZIP" rm -f "$ZIP"
( cd "$TMP" && zip -q "$ZIP" ./* ) ( cd "$TMP" && zip -qr "$ZIP" . )
rm -rf "$TMP" rm -rf "$TMP"
echo " -> dist/$LABEL/GC-${VERSION}-${LABEL}.zip" echo " -> dist/$LABEL/GC-${VERSION}-${LABEL}.zip"
done done
@@ -284,7 +364,7 @@ package_mac_app() {
<dict> <dict>
<key>CFBundleName</key><string>GC</string> <key>CFBundleName</key><string>GC</string>
<key>CFBundleDisplayName</key><string>GC</string> <key>CFBundleDisplayName</key><string>GC</string>
<key>CFBundleIdentifier</key><string>cn.neorf.GC</string> <key>CFBundleIdentifier</key><string>com.xhmcl.GC</string>
<key>CFBundleVersion</key><string>${VERSION}</string> <key>CFBundleVersion</key><string>${VERSION}</string>
<key>CFBundleShortVersionString</key><string>${VERSION}</string> <key>CFBundleShortVersionString</key><string>${VERSION}</string>
<key>CFBundlePackageType</key><string>APPL</string> <key>CFBundlePackageType</key><string>APPL</string>
+2 -2
View File
@@ -74,10 +74,10 @@ dll / json 的哈希 —— 本地文件被替换会直接拒绝加载。
"descriptionI18n": { "zh-CN": "……", "en": "……" }, "descriptionI18n": { "zh-CN": "……", "en": "……" },
"version": "1.6", "version": "1.6",
"updatedAt": "2026-11-14T08:00:00Z", "updatedAt": "2026-11-14T08:00:00Z",
"author": "NeoRF", "author": "Morris",
"tags": ["astronomy", "geography"], "tags": ["astronomy", "geography"],
"assembly": "EarthRotationModel.dll", "assembly": "EarthRotationModel.dll",
"type": "NeoRF.EarthModels.RotationModelFactory", "type": "GC.EarthModels.RotationModelFactory",
"preview": "preview.png", "preview": "preview.png",
"apiVersion": 1, "apiVersion": 1,
"minAppVersion": "1.0.7" "minAppVersion": "1.0.7"
+1 -1
View File
@@ -5,7 +5,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace> <RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthModelPreview</AssemblyName> <AssemblyName>EarthModelPreview</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
+2 -2
View File
@@ -10,9 +10,9 @@ using Avalonia.Headless;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
using Avalonia.Platform; using Avalonia.Platform;
using GC.ModelSdk; using GC.ModelSdk;
using NeoRF.EarthModels; using GC.EarthModels;
namespace NeoRF.EarthModels.Preview; namespace GC.EarthModels.Preview;
/// <summary> /// <summary>
/// 封面生成工具:给每个模型画一张 preview.png。 /// 封面生成工具:给每个模型画一张 preview.png。
+2 -2
View File
@@ -11,7 +11,7 @@ using GC.Services;
// 仓库根 version.json 与 model/version.json(内容相同,便于两种源地址读取)。 // 仓库根 version.json 与 model/version.json(内容相同,便于两种源地址读取)。
// 仓库地址(编译产物的 Release 也发在这里):与启动器默认 updateRepository 保持一致。 // 仓库地址(编译产物的 Release 也发在这里):与启动器默认 updateRepository 保持一致。
const string Repository = "https://gitcode.com/Morris_1/GC"; const string Repository = "https://git.xhmcl.com/Morris/GC";
// 位置参数:<仓库根> <启动器版本>;开关:--launcher-only // 位置参数:<仓库根> <启动器版本>;开关:--launcher-only
// --launcher-only 只刷新 launcher.packages(构建脚本在打完 zip 之后再调一次), // --launcher-only 只刷新 launcher.packages(构建脚本在打完 zip 之后再调一次),
@@ -150,7 +150,7 @@ var packages = new Dictionary<string, Dictionary<string, object>>();
// 2) 仓库里的编译产物 dist/<系统>-<架构>/GC-<版本>-<系统>-<架构>.zip —— // 2) 仓库里的编译产物 dist/<系统>-<架构>/GC-<版本>-<系统>-<架构>.zip ——
// 不发 Release、只提交产物也能更新(用户明确要求支持这种布局)。 // 不发 Release、只提交产物也能更新(用户明确要求支持这种布局)。
// 两种都写:url 只是「去哪儿找」,真正的完整性凭据是下面的 sha256(受签名保护)。 // 两种都写:url 只是「去哪儿找」,真正的完整性凭据是下面的 sha256(受签名保护)。
var releaseBase = $"{Repository}/releases/download/v{launcherVersion}"; var releaseBase = $"{Repository}/releases/download/{launcherVersion}";
foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-x64" }) foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-x64" })
{ {
var label = LauncherArtifacts.LabelOf(rid); var label = LauncherArtifacts.LabelOf(rid);
+1 -1
View File
@@ -12,7 +12,7 @@ using Avalonia.Media.Imaging;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Threading; using Avalonia.Threading;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
public enum SceneView public enum SceneView
{ {
+1 -1
View File
@@ -11,7 +11,7 @@ using Avalonia.Media;
using Avalonia.Threading; using Avalonia.Threading;
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 模型自己的界面:画布 + 触控友好工具栏 + 课堂演示卡 + 节气定格与步进。 /// 模型自己的界面:画布 + 触控友好工具栏 + 课堂演示卡 + 节气定格与步进。
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using Avalonia.Controls; using Avalonia.Controls;
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 地球模型共享运行时:读自己目录下的 scene.json / land.json / i18n, /// 地球模型共享运行时:读自己目录下的 scene.json / land.json / i18n,
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Numerics; using System.Numerics;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 地理模型的球面几何工具:经纬度 ↔ 单位球坐标、正交投影到屏幕、 /// 地理模型的球面几何工具:经纬度 ↔ 单位球坐标、正交投影到屏幕、
+1 -1
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary>&lt;id&gt;.model/land.json —— 简化的大陆轮廓(经纬度多边形)。</summary> /// <summary>&lt;id&gt;.model/land.json —— 简化的大陆轮廓(经纬度多边形)。</summary>
public sealed class LandData public sealed class LandData
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary>模型自己的 JSON 读写(不依赖启动器)。</summary> /// <summary>模型自己的 JSON 读写(不依赖启动器)。</summary>
public static class ModelJson public static class ModelJson
+1 -1
View File
@@ -4,7 +4,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Text.Json; using System.Text.Json;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 模型自己的一份文案。优先读模型数据目录里的 <c>i18n/&lt;language&gt;.json</c>, /// 模型自己的一份文案。优先读模型数据目录里的 <c>i18n/&lt;language&gt;.json</c>,
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary>&lt;id&gt;.model/scene.json —— 模型数据(可视化场景描述)。</summary> /// <summary>&lt;id&gt;.model/scene.json —— 模型数据(可视化场景描述)。</summary>
public sealed class SceneDefinition public sealed class SceneDefinition
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using System.IO; using System.IO;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 模型自己的场景运行时:场景描述 + 预烘焙地表纹理 + 调色板。 /// 模型自己的场景运行时:场景描述 + 预烘焙地表纹理 + 调色板。
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 预烘焙的等经纬度地表贴图:反照率 + 高度 + 冰盖 + 云层 + 夜间灯光。 /// 预烘焙的等经纬度地表贴图:反照率 + 高度 + 冰盖 + 云层 + 夜间灯光。
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Numerics;
using System.Threading.Tasks; using System.Threading.Tasks;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 球体像素级渲染:正交投影 + 预烘焙地表纹理 + 地形光照 + 云层 + 夜灯 + 大气边缘光。 /// 球体像素级渲染:正交投影 + 预烘焙地表纹理 + 地形光照 + 云层 + 夜灯 + 大气边缘光。
+4 -4
View File
@@ -16,8 +16,8 @@
"terrain" "terrain"
], ],
"assembly": "ContourMapModel.dll", "assembly": "ContourMapModel.dll",
"type": "NeoRF.ContourMap.ContourMapFactory", "type": "GC.ContourMap.ContourMapFactory",
"version": "1.0", "version": "1.1",
"chrome": { "chrome": {
"titleBar": "#0C1828", "titleBar": "#0C1828",
"titleBorder": "#1B2740", "titleBorder": "#1B2740",
@@ -25,6 +25,6 @@
"button": "#9FB4D4", "button": "#9FB4D4",
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "e4b3f2b87e", "build": "773ab2161d",
"updatedAt": "2026-11-14T11:34:35Z" "updatedAt": "2026-11-18T10:16:41Z"
} }
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.ContourMap</RootNamespace> <RootNamespace>GC.ContourMap</RootNamespace>
<AssemblyName>ContourMapModel</AssemblyName> <AssemblyName>ContourMapModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
+1 -1
View File
@@ -6,7 +6,7 @@ using Avalonia.Layout;
using Avalonia.Media; using Avalonia.Media;
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.ContourMap; namespace GC.ContourMap;
/// <summary>等高线模型入口(清单里的 type 指向这里)。</summary> /// <summary>等高线模型入口(清单里的 type 指向这里)。</summary>
public sealed class ContourMapFactory : IModelFactory public sealed class ContourMapFactory : IModelFactory
+1 -1
View File
@@ -5,7 +5,7 @@ using Avalonia.Controls;
using Avalonia.Layout; using Avalonia.Layout;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.ContourMap; namespace GC.ContourMap;
/// <summary>等高线模型的界面:顶部标题、中间双图联动、右侧判读要点、底部实时读数。</summary> /// <summary>等高线模型的界面:顶部标题、中间双图联动、右侧判读要点、底部实时读数。</summary>
public sealed class ContourPage public sealed class ContourPage
+1 -1
View File
@@ -6,7 +6,7 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.ContourMap; namespace GC.ContourMap;
/// <summary> /// <summary>
/// 等高线教学画布,左右两块: /// 等高线教学画布,左右两块:
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace NeoRF.ContourMap; namespace GC.ContourMap;
/// <summary>内置全量文案兜底:没有语言包也能完整显示。</summary> /// <summary>内置全量文案兜底:没有语言包也能完整显示。</summary>
internal static class DefaultTexts internal static class DefaultTexts
+1 -1
View File
@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace NeoRF.ContourMap; namespace GC.ContourMap;
/// <summary>地形部位识别结果:课本要求学生能在等高线图上认出这五种部位。</summary> /// <summary>地形部位识别结果:课本要求学生能在等高线图上认出这五种部位。</summary>
public enum TerrainFeature public enum TerrainFeature
+1 -1
View File
@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace NeoRF.ContourMap; namespace GC.ContourMap;
/// <summary>五种基本地形类型(教科书分类)。</summary> /// <summary>五种基本地形类型(教科书分类)。</summary>
public enum TerrainKind public enum TerrainKind
+4 -4
View File
@@ -9,7 +9,7 @@
"en": "Climate zones, continent/ocean outlines, plates and borders — clean line art." "en": "Climate zones, continent/ocean outlines, plates and borders — clean line art."
}, },
"assembly": "EarthGeographyModel.dll", "assembly": "EarthGeographyModel.dll",
"type": "NeoRF.EarthModels.GeographyModelFactory", "type": "GC.EarthModels.GeographyModelFactory",
"author": "Morris GC", "author": "Morris GC",
"tags": [ "tags": [
"geography", "geography",
@@ -17,7 +17,7 @@
"atlas" "atlas"
], ],
"dataDir": "earth-geography.model", "dataDir": "earth-geography.model",
"version": "1.8", "version": "1.9",
"chrome": { "chrome": {
"titleBar": "#0C1828", "titleBar": "#0C1828",
"titleBorder": "#1B2740", "titleBorder": "#1B2740",
@@ -25,6 +25,6 @@
"button": "#9FB4D4", "button": "#9FB4D4",
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "3b645c45c2", "build": "cc68b8863b",
"updatedAt": "2026-11-14T11:34:35Z" "updatedAt": "2026-11-18T10:16:41Z"
} }
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace> <RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthGeographyModel</AssemblyName> <AssemblyName>EarthGeographyModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary>地球地理模型的数据文件:全部是经纬度折线,只有轮廓没有填色。</summary> /// <summary>地球地理模型的数据文件:全部是经纬度折线,只有轮廓没有填色。</summary>
public sealed class GeoData public sealed class GeoData
@@ -7,7 +7,7 @@ using Avalonia.Layout;
using Avalonia.Media; using Avalonia.Media;
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary> /// <summary>
/// 地球地理模型:五带划分 + 七大洲四大洋轮廓 + 六大板块与洲界,纯线稿。 /// 地球地理模型:五带划分 + 七大洲四大洋轮廓 + 六大板块与洲界,纯线稿。
+1 -1
View File
@@ -8,7 +8,7 @@ using Avalonia.Input;
using Avalonia.Media; using Avalonia.Media;
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
public enum GeoMode { Sphere3D, Flat2D } public enum GeoMode { Sphere3D, Flat2D }
+5 -5
View File
@@ -6,7 +6,7 @@
"zh-CN": "地球公转", "zh-CN": "地球公转",
"en": "Earth Revolution" "en": "Earth Revolution"
}, },
"author": "NeoRF", "author": "Morris",
"description": "四季更替、黄赤交角与二分二至", "description": "四季更替、黄赤交角与二分二至",
"descriptionI18n": { "descriptionI18n": {
"zh-CN": "地球绕太阳公转一年:地轴指向不变,太阳直射点南北往返,形成四季。", "zh-CN": "地球绕太阳公转一年:地轴指向不变,太阳直射点南北往返,形成四季。",
@@ -20,10 +20,10 @@
"entry": "scene.json", "entry": "scene.json",
"license": "MIT", "license": "MIT",
"assembly": "EarthRevolutionModel.dll", "assembly": "EarthRevolutionModel.dll",
"type": "NeoRF.EarthModels.RevolutionModelFactory", "type": "GC.EarthModels.RevolutionModelFactory",
"preview": "preview.png", "preview": "preview.png",
"apiVersion": 1, "apiVersion": 1,
"version": "1.6", "version": "1.7",
"chrome": { "chrome": {
"titleBar": "#0C1828", "titleBar": "#0C1828",
"titleBorder": "#1B2740", "titleBorder": "#1B2740",
@@ -31,6 +31,6 @@
"button": "#9FB4D4", "button": "#9FB4D4",
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "947efa36bb", "build": "53b7a0fbc3",
"updatedAt": "2026-11-14T11:34:35Z" "updatedAt": "2026-11-18T10:16:41Z"
} }
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace> <RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthRevolutionModel</AssemblyName> <AssemblyName>EarthRevolutionModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
@@ -1,6 +1,6 @@
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary>地球公转模型入口(清单里的 type 指向这里)。</summary> /// <summary>地球公转模型入口(清单里的 type 指向这里)。</summary>
public sealed class RevolutionModelFactory : IModelFactory public sealed class RevolutionModelFactory : IModelFactory
+5 -5
View File
@@ -6,7 +6,7 @@
"zh-CN": "地球自转", "zh-CN": "地球自转",
"en": "Earth Rotation" "en": "Earth Rotation"
}, },
"author": "NeoRF", "author": "Morris",
"description": "昼夜交替、晨昏线与太阳直射点", "description": "昼夜交替、晨昏线与太阳直射点",
"descriptionI18n": { "descriptionI18n": {
"zh-CN": "观察自转中的地球:昼夜半球、晨昏线与太阳直射点位置。", "zh-CN": "观察自转中的地球:昼夜半球、晨昏线与太阳直射点位置。",
@@ -20,10 +20,10 @@
"entry": "scene.json", "entry": "scene.json",
"license": "MIT", "license": "MIT",
"assembly": "EarthRotationModel.dll", "assembly": "EarthRotationModel.dll",
"type": "NeoRF.EarthModels.RotationModelFactory", "type": "GC.EarthModels.RotationModelFactory",
"preview": "preview.png", "preview": "preview.png",
"apiVersion": 1, "apiVersion": 1,
"version": "1.6", "version": "1.7",
"chrome": { "chrome": {
"titleBar": "#0C1828", "titleBar": "#0C1828",
"titleBorder": "#1B2740", "titleBorder": "#1B2740",
@@ -31,6 +31,6 @@
"button": "#9FB4D4", "button": "#9FB4D4",
"frame": "#0A1524" "frame": "#0A1524"
}, },
"build": "a803d9c020", "build": "ecd52665f9",
"updatedAt": "2026-11-14T11:34:35Z" "updatedAt": "2026-11-18T10:16:41Z"
} }
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.EarthModels</RootNamespace> <RootNamespace>GC.EarthModels</RootNamespace>
<AssemblyName>EarthRotationModel</AssemblyName> <AssemblyName>EarthRotationModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
@@ -1,6 +1,6 @@
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.EarthModels; namespace GC.EarthModels;
/// <summary>地球自转模型入口(清单里的 type 指向这里)。</summary> /// <summary>地球自转模型入口(清单里的 type 指向这里)。</summary>
public sealed class RotationModelFactory : IModelFactory public sealed class RotationModelFactory : IModelFactory
+4 -4
View File
@@ -21,10 +21,10 @@
"entry": "scales.json", "entry": "scales.json",
"license": "MIT", "license": "MIT",
"assembly": "ScaleCalculatorModel.dll", "assembly": "ScaleCalculatorModel.dll",
"type": "NeoRF.ScaleCalculator.ScaleCalculatorFactory", "type": "GC.ScaleCalculator.ScaleCalculatorFactory",
"preview": "preview.png", "preview": "preview.png",
"apiVersion": 1, "apiVersion": 1,
"version": "1.5", "version": "1.6",
"chrome": { "chrome": {
"titleBar": "#FFFFFF", "titleBar": "#FFFFFF",
"titleBorder": "#E3E8F3", "titleBorder": "#E3E8F3",
@@ -32,6 +32,6 @@
"button": "#5B6A86", "button": "#5B6A86",
"frame": "#F4F6FB" "frame": "#F4F6FB"
}, },
"build": "02a555272a", "build": "105653737d",
"updatedAt": "2026-11-14T11:34:35Z" "updatedAt": "2026-11-18T10:16:41Z"
} }
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
/// <summary>内置全量文案兜底:即使模型包里没有语言包也能完整显示。</summary> /// <summary>内置全量文案兜底:即使模型包里没有语言包也能完整显示。</summary>
internal static class DefaultTexts internal static class DefaultTexts
@@ -1,6 +1,6 @@
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
/// <summary>比例尺计算器模型入口(清单里的 type 指向这里)。</summary> /// <summary>比例尺计算器模型入口(清单里的 type 指向这里)。</summary>
public sealed class ScaleCalculatorFactory : IModelFactory public sealed class ScaleCalculatorFactory : IModelFactory
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<RootNamespace>NeoRF.ScaleCalculator</RootNamespace> <RootNamespace>GC.ScaleCalculator</RootNamespace>
<AssemblyName>ScaleCalculatorModel</AssemblyName> <AssemblyName>ScaleCalculatorModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
@@ -5,7 +5,7 @@ using System.Text.Json;
using Avalonia.Controls; using Avalonia.Controls;
using GC.ModelSdk; using GC.ModelSdk;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
/// <summary> /// <summary>
/// 比例尺计算器运行时。Prepare 在后台线程读数据/语言包,CreateView 在 UI 线程构建界面。 /// 比例尺计算器运行时。Prepare 在后台线程读数据/语言包,CreateView 在 UI 线程构建界面。
@@ -5,7 +5,7 @@ using Avalonia.Controls.Primitives;
using Avalonia.Layout; using Avalonia.Layout;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
public sealed partial class ScaleCalculatorView public sealed partial class ScaleCalculatorView
{ {
@@ -5,7 +5,7 @@ using Avalonia.Controls;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
public sealed partial class ScaleCalculatorView public sealed partial class ScaleCalculatorView
{ {
@@ -8,7 +8,7 @@ using Avalonia.Input;
using Avalonia.Layout; using Avalonia.Layout;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
/// <summary> /// <summary>
/// 比例尺计算器主界面。三栏(已知量 / 可视化标尺 / 三种写法与判读)+ 底部实地尺与练习。 /// 比例尺计算器主界面。三栏(已知量 / 可视化标尺 / 三种写法与判读)+ 底部实地尺与练习。
+1 -1
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
public sealed class PresetItem public sealed class PresetItem
{ {
+1 -1
View File
@@ -1,7 +1,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
/// <summary>三种求解模式:待求的量。</summary> /// <summary>三种求解模式:待求的量。</summary>
public enum SolveMode public enum SolveMode
+1 -1
View File
@@ -4,7 +4,7 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Media; using Avalonia.Media;
namespace NeoRF.ScaleCalculator; namespace GC.ScaleCalculator;
/// <summary> /// <summary>
/// 自绘可视化标尺:上条「图上距离」按真实厘米画,下条「实地距离」按同一比例尺压缩, /// 自绘可视化标尺:上条「图上距离」按真实厘米画,下条「实地距离」按同一比例尺压缩,
+48 -48
View File
@@ -1,103 +1,103 @@
{ {
"schema": 1, "schema": 1,
"generated": "2026-11-14T11:34:35Z", "generated": "2026-11-18T10:16:41Z",
"repository": "https://gitcode.com/Morris_1/GC", "repository": "https://git.xhmcl.com/Morris/GC",
"branch": "main", "branch": "main",
"modelDir": "model", "modelDir": "model",
"launcher": { "launcher": {
"version": "1.0.7", "version": "1.0.9",
"revision": "", "revision": "",
"packages": { "packages": {
"win-x64": { "win-x64": {
"path": "dist/win-amd64/GC-1.0.7-win-amd64.zip", "path": "dist/win-amd64/GC-1.0.9-win-amd64.zip",
"dir": "dist/win-amd64", "dir": "dist/win-amd64",
"name": "GC-1.0.7-win-amd64.zip", "name": "GC-1.0.9-win-amd64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-amd64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-amd64.zip",
"sha256": "f90ff51ac6b041ae238cbeb4672622b0d029142a9d8b0705f08e654336512308", "sha256": "0807f1005e2d8bd54316529670cf1c3c89a2df07bd39297145f21c9a0aae5f04",
"size": 46363183 "size": 114372206
}, },
"win-arm64": { "win-arm64": {
"path": "dist/win-arm64/GC-1.0.7-win-arm64.zip", "path": "dist/win-arm64/GC-1.0.9-win-arm64.zip",
"dir": "dist/win-arm64", "dir": "dist/win-arm64",
"name": "GC-1.0.7-win-arm64.zip", "name": "GC-1.0.9-win-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-arm64.zip",
"sha256": "0b2bab2c3ac7e6223d8dd0b0faf9a0994319fa5ad13826addf7b402619b812e0", "sha256": "ffdc37f8ea5041d69be88ffbcbf9ba5d80f7fb97c6b3debc5a918ff89f9e7f60",
"size": 44390354 "size": 110425463
}, },
"osx-arm64": { "osx-arm64": {
"path": "dist/mac-arm64/GC-1.0.7-mac-arm64.zip", "path": "dist/mac-arm64/GC-1.0.9-mac-arm64.zip",
"dir": "dist/mac-arm64", "dir": "dist/mac-arm64",
"name": "GC-1.0.7-mac-arm64.zip", "name": "GC-1.0.9-mac-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-arm64.zip",
"sha256": "e5fd355bace68dc0794eb3e049cbef63c952a60a765ab3806adaf1199e1b09ab", "sha256": "e62bbc8c9925d8158f850440600b5d16af7539c85651a5ebcc5f9a85d4c9bb01",
"size": 9178314 "size": 60066040
}, },
"osx-x64": { "osx-x64": {
"path": "dist/mac-x64/GC-1.0.7-mac-x64.zip", "path": "dist/mac-x64/GC-1.0.9-mac-x64.zip",
"dir": "dist/mac-x64", "dir": "dist/mac-x64",
"name": "GC-1.0.7-mac-x64.zip", "name": "GC-1.0.9-mac-x64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-x64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-x64.zip"
}, },
"linux-x64": { "linux-x64": {
"path": "dist/linux-amd64/GC-1.0.7-linux-amd64.zip", "path": "dist/linux-amd64/GC-1.0.9-linux-amd64.zip",
"dir": "dist/linux-amd64", "dir": "dist/linux-amd64",
"name": "GC-1.0.7-linux-amd64.zip", "name": "GC-1.0.9-linux-amd64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-linux-amd64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-linux-amd64.zip"
} }
} }
}, },
"models": [ "models": [
{ {
"id": "contour-map", "id": "contour-map",
"version": "1.0", "version": "1.1",
"build": "e4b3f2b87e", "build": "773ab2161d",
"manifestSha256": "ee0897d46ee85126fbfd0d07f5ca3111950d0c36f9b8a80e4eb6ae85d226da4f", "manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733",
"filesSha256": "b1f323fb41dec4f45992a30ff8726f3307f83b564127aff99bcb3d044c79d2bd", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5, "files": 5,
"dir": "model/contour-map" "dir": "model/contour-map"
}, },
{ {
"id": "earth-geography", "id": "earth-geography",
"version": "1.8", "version": "1.9",
"build": "3b645c45c2", "build": "cc68b8863b",
"manifestSha256": "a9f30fd4a1dd0aeccb88c892579c93bf32a92379d7b3f545b28f6cac612f9871", "manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a",
"filesSha256": "0e55d2f9bacc3e0ff42f5c45d9e7c265864df9784b1609c09dcb32d21b4addfc", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11, "files": 11,
"dir": "model/earth-geography" "dir": "model/earth-geography"
}, },
{ {
"id": "earth-revolution", "id": "earth-revolution",
"version": "1.6", "version": "1.7",
"build": "947efa36bb", "build": "53b7a0fbc3",
"manifestSha256": "feb715cde8ad5da9ecfb48785a95e6fc82930cc92c668514b328915366c2f57a", "manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167",
"filesSha256": "a37e0b493c78bb0a04a276512b612be3f8e7a178ed1a7fc72acb5353aa57f7c5", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7, "files": 7,
"dir": "model/earth-revolution" "dir": "model/earth-revolution"
}, },
{ {
"id": "earth-rotation", "id": "earth-rotation",
"version": "1.6", "version": "1.7",
"build": "a803d9c020", "build": "ecd52665f9",
"manifestSha256": "56ed397cbc008bd9ec8bea0ee34a94a28ab29ce39a8b096b0629e529883b4dff", "manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca",
"filesSha256": "4e4428812d18d15a99105e73c027b99f3197033f0138d643ba69c15fabc9d8f6", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7, "files": 7,
"dir": "model/earth-rotation" "dir": "model/earth-rotation"
}, },
{ {
"id": "scale-calculator", "id": "scale-calculator",
"version": "1.5", "version": "1.6",
"build": "02a555272a", "build": "105653737d",
"manifestSha256": "d00034888d9b9da03338b7f394d1bdf33f73b1fbdd7e8f154d85b9080318ab13", "manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3",
"filesSha256": "4a5fbf898df1d98eddf68b5d3929ae7b25cd7bcdfdfa36b5ad0ed72d9941d049", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6, "files": 6,
"dir": "model/scale-calculator" "dir": "model/scale-calculator"
} }
], ],
"signature": { "signature": {
"alg": "ECDSA-P256-SHA256", "alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-11", "keyId": "gc-2026-12",
"value": "LHaF2bw+IZeWUw2qLQM1IQHoNXsHNko38dyjP45Jy41KtlyhvJhhFaNh+THKhAU+6jSzV1eFHgbwasboYBOa5w==", "value": "A2jaSxRK1B43k8uOWmC/8diYG6JYUncGgjXW8B1ntO5Ag5rsG7Pb2gMz5ad6AcwjZ9zs8qtsSxJv8vLsUNXtWw==",
"contentSha256": "749055593bf9839837428d900d523b3363486556970cbf4e2daa25001ab174c8", "contentSha256": "3bf738a164537e5d575e75c314f0ac01af1cb5d4d7cb882489d8dedeb73f51e9",
"signedAt": "2026-11-14T11:36:03Z" "signedAt": "2026-11-18T10:18:01Z"
} }
} }
+48 -48
View File
@@ -1,103 +1,103 @@
{ {
"schema": 1, "schema": 1,
"generated": "2026-11-14T11:34:35Z", "generated": "2026-11-18T10:16:41Z",
"repository": "https://gitcode.com/Morris_1/GC", "repository": "https://git.xhmcl.com/Morris/GC",
"branch": "main", "branch": "main",
"modelDir": "model", "modelDir": "model",
"launcher": { "launcher": {
"version": "1.0.7", "version": "1.0.9",
"revision": "", "revision": "",
"packages": { "packages": {
"win-x64": { "win-x64": {
"path": "dist/win-amd64/GC-1.0.7-win-amd64.zip", "path": "dist/win-amd64/GC-1.0.9-win-amd64.zip",
"dir": "dist/win-amd64", "dir": "dist/win-amd64",
"name": "GC-1.0.7-win-amd64.zip", "name": "GC-1.0.9-win-amd64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-amd64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-amd64.zip",
"sha256": "f90ff51ac6b041ae238cbeb4672622b0d029142a9d8b0705f08e654336512308", "sha256": "0807f1005e2d8bd54316529670cf1c3c89a2df07bd39297145f21c9a0aae5f04",
"size": 46363183 "size": 114372206
}, },
"win-arm64": { "win-arm64": {
"path": "dist/win-arm64/GC-1.0.7-win-arm64.zip", "path": "dist/win-arm64/GC-1.0.9-win-arm64.zip",
"dir": "dist/win-arm64", "dir": "dist/win-arm64",
"name": "GC-1.0.7-win-arm64.zip", "name": "GC-1.0.9-win-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-arm64.zip",
"sha256": "0b2bab2c3ac7e6223d8dd0b0faf9a0994319fa5ad13826addf7b402619b812e0", "sha256": "ffdc37f8ea5041d69be88ffbcbf9ba5d80f7fb97c6b3debc5a918ff89f9e7f60",
"size": 44390354 "size": 110425463
}, },
"osx-arm64": { "osx-arm64": {
"path": "dist/mac-arm64/GC-1.0.7-mac-arm64.zip", "path": "dist/mac-arm64/GC-1.0.9-mac-arm64.zip",
"dir": "dist/mac-arm64", "dir": "dist/mac-arm64",
"name": "GC-1.0.7-mac-arm64.zip", "name": "GC-1.0.9-mac-arm64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-arm64.zip", "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-arm64.zip",
"sha256": "e5fd355bace68dc0794eb3e049cbef63c952a60a765ab3806adaf1199e1b09ab", "sha256": "e62bbc8c9925d8158f850440600b5d16af7539c85651a5ebcc5f9a85d4c9bb01",
"size": 9178314 "size": 60066040
}, },
"osx-x64": { "osx-x64": {
"path": "dist/mac-x64/GC-1.0.7-mac-x64.zip", "path": "dist/mac-x64/GC-1.0.9-mac-x64.zip",
"dir": "dist/mac-x64", "dir": "dist/mac-x64",
"name": "GC-1.0.7-mac-x64.zip", "name": "GC-1.0.9-mac-x64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-x64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-x64.zip"
}, },
"linux-x64": { "linux-x64": {
"path": "dist/linux-amd64/GC-1.0.7-linux-amd64.zip", "path": "dist/linux-amd64/GC-1.0.9-linux-amd64.zip",
"dir": "dist/linux-amd64", "dir": "dist/linux-amd64",
"name": "GC-1.0.7-linux-amd64.zip", "name": "GC-1.0.9-linux-amd64.zip",
"url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-linux-amd64.zip" "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-linux-amd64.zip"
} }
} }
}, },
"models": [ "models": [
{ {
"id": "contour-map", "id": "contour-map",
"version": "1.0", "version": "1.1",
"build": "e4b3f2b87e", "build": "773ab2161d",
"manifestSha256": "ee0897d46ee85126fbfd0d07f5ca3111950d0c36f9b8a80e4eb6ae85d226da4f", "manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733",
"filesSha256": "b1f323fb41dec4f45992a30ff8726f3307f83b564127aff99bcb3d044c79d2bd", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699",
"files": 5, "files": 5,
"dir": "model/contour-map" "dir": "model/contour-map"
}, },
{ {
"id": "earth-geography", "id": "earth-geography",
"version": "1.8", "version": "1.9",
"build": "3b645c45c2", "build": "cc68b8863b",
"manifestSha256": "a9f30fd4a1dd0aeccb88c892579c93bf32a92379d7b3f545b28f6cac612f9871", "manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a",
"filesSha256": "0e55d2f9bacc3e0ff42f5c45d9e7c265864df9784b1609c09dcb32d21b4addfc", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95",
"files": 11, "files": 11,
"dir": "model/earth-geography" "dir": "model/earth-geography"
}, },
{ {
"id": "earth-revolution", "id": "earth-revolution",
"version": "1.6", "version": "1.7",
"build": "947efa36bb", "build": "53b7a0fbc3",
"manifestSha256": "feb715cde8ad5da9ecfb48785a95e6fc82930cc92c668514b328915366c2f57a", "manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167",
"filesSha256": "a37e0b493c78bb0a04a276512b612be3f8e7a178ed1a7fc72acb5353aa57f7c5", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1",
"files": 7, "files": 7,
"dir": "model/earth-revolution" "dir": "model/earth-revolution"
}, },
{ {
"id": "earth-rotation", "id": "earth-rotation",
"version": "1.6", "version": "1.7",
"build": "a803d9c020", "build": "ecd52665f9",
"manifestSha256": "56ed397cbc008bd9ec8bea0ee34a94a28ab29ce39a8b096b0629e529883b4dff", "manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca",
"filesSha256": "4e4428812d18d15a99105e73c027b99f3197033f0138d643ba69c15fabc9d8f6", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e",
"files": 7, "files": 7,
"dir": "model/earth-rotation" "dir": "model/earth-rotation"
}, },
{ {
"id": "scale-calculator", "id": "scale-calculator",
"version": "1.5", "version": "1.6",
"build": "02a555272a", "build": "105653737d",
"manifestSha256": "d00034888d9b9da03338b7f394d1bdf33f73b1fbdd7e8f154d85b9080318ab13", "manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3",
"filesSha256": "4a5fbf898df1d98eddf68b5d3929ae7b25cd7bcdfdfa36b5ad0ed72d9941d049", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604",
"files": 6, "files": 6,
"dir": "model/scale-calculator" "dir": "model/scale-calculator"
} }
], ],
"signature": { "signature": {
"alg": "ECDSA-P256-SHA256", "alg": "ECDSA-P256-SHA256",
"keyId": "gc-2026-11", "keyId": "gc-2026-12",
"value": "LHaF2bw+IZeWUw2qLQM1IQHoNXsHNko38dyjP45Jy41KtlyhvJhhFaNh+THKhAU+6jSzV1eFHgbwasboYBOa5w==", "value": "A2jaSxRK1B43k8uOWmC/8diYG6JYUncGgjXW8B1ntO5Ag5rsG7Pb2gMz5ad6AcwjZ9zs8qtsSxJv8vLsUNXtWw==",
"contentSha256": "749055593bf9839837428d900d523b3363486556970cbf4e2daa25001ab174c8", "contentSha256": "3bf738a164537e5d575e75c314f0ac01af1cb5d4d7cb882489d8dedeb73f51e9",
"signedAt": "2026-11-14T11:36:03Z" "signedAt": "2026-11-18T10:18:01Z"
} }
} }