Compare commits

...
Author SHA1 Message Date
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
15 changed files with 1082 additions and 109 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
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',
+10
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,9 +28,14 @@ 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 ValueListenableBuilder<Color>(
valueListenable: GcPalette.accent,
builder: (context, accent, _) {
return MaterialApp( return MaterialApp(
title: 'Morris GC', title: 'Morris GC',
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
@@ -36,5 +44,7 @@ class _GcUiAppState extends State<GcUiApp> {
); );
}, },
); );
},
);
} }
} }
+327 -29
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,31 +359,122 @@ 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;
return MouseRegion(
onEnter: (_) => setState(() => _hover = true),
onExit: (_) => setState(() => _hover = false),
cursor: SystemMouseCursors.click,
child: AnimatedContainer(
duration: const Duration(milliseconds: 160),
curve: Curves.easeOut,
width: 336, width: 336,
transform: Matrix4.translationValues(0, _hover ? -3 : 0, 0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
boxShadow: <BoxShadow>[
BoxShadow(
color: Colors.black.withOpacity(_hover ? 0.42 : 0.22),
blurRadius: _hover ? 26 : 14,
offset: Offset(0, _hover ? 10 : 6),
),
],
),
child: GcCard( child: GcCard(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
// 封面:图片 + 底部渐变遮罩 + 播放提示 + 版本徽章。
ClipRRect( ClipRRect(
borderRadius: const BorderRadius.vertical(top: Radius.circular(13)), borderRadius:
const BorderRadius.vertical(top: Radius.circular(13)),
child: SizedBox( child: SizedBox(
height: 138, height: 152,
width: double.infinity, width: double.infinity,
child: Container( child: Stack(
fit: StackFit.expand,
children: <Widget>[
Container(
color: const Color(0xFF0B1226), color: const Color(0xFF0B1226),
child: model.hasPreview child: model.hasPreview
? Image.network( ? Image.network(
previewUrl, widget.previewUrl,
fit: BoxFit.cover, fit: BoxFit.cover,
// 只按展示尺寸解码,避免大图占用内存、拖慢首帧。
cacheWidth: 672,
errorBuilder: (context, error, stack) => errorBuilder: (context, error, stack) =>
const _PreviewFallback(), const _PreviewFallback(),
) )
: 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],
),
),
),
Positioned(
left: 14,
right: 14,
bottom: 11,
child: Row(
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)),
),
),
],
),
),
],
),
), ),
), ),
Padding( Padding(
@@ -398,15 +489,15 @@ class _ModelCard extends StatelessWidget {
model.name, model.name,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14.5,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w700,
color: GcColors.ink, color: GcColors.ink,
), ),
), ),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
Text( Text(
model.metaText, model.sizeText,
style: const TextStyle( style: const TextStyle(
fontSize: 10.5, fontSize: 10.5,
color: GcColors.faint, color: GcColors.faint,
@@ -415,43 +506,54 @@ class _ModelCard extends StatelessWidget {
], ],
), ),
const SizedBox(height: 7), const SizedBox(height: 7),
// 简介:固定两行高度,避免卡片高低不齐。
SizedBox( SizedBox(
height: 34, height: 34,
child: Text( child: Text(
model.description, model.description.isEmpty
? T('home.noDescription')
: model.description,
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: const TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
color: GcColors.muted,
height: 1.4, height: 1.4,
color: model.description.isEmpty
? GcColors.faint
: GcColors.muted,
), ),
), ),
), ),
if (model.tags.isNotEmpty) ...<Widget>[ if (model.tags.isNotEmpty) ...<Widget>[
const SizedBox(height: 6), const SizedBox(height: 8),
Text( Wrap(
model.tags.join(' · '), spacing: 6,
style: const TextStyle( runSpacing: 4,
fontSize: 10.5, children: <Widget>[
color: GcColors.faint, for (final tag in model.tags.take(3))
), _CoverPill(
text: tag,
color: GcColors.muted,
subtle: true,
), ),
], ],
const SizedBox(height: 12), ),
],
const SizedBox(height: 13),
Row( Row(
children: <Widget>[ children: <Widget>[
FilledButton( FilledButton.icon(
onPressed: onLaunch, onPressed: widget.onLaunch,
child: Text(T('home.launch')), icon: const Icon(Icons.play_arrow_rounded, size: 17),
label: Text(T('home.launch')),
), ),
const Spacer(), const Spacer(),
TextButton( TextButton(
onPressed: onOpenFolder, onPressed: widget.onOpenFolder,
child: Text(T('home.open')), child: Text(T('home.open')),
), ),
TextButton( TextButton(
onPressed: onDelete, onPressed: widget.onDelete,
style: TextButton.styleFrom( style: TextButton.styleFrom(
foregroundColor: GcColors.danger, foregroundColor: GcColors.danger,
), ),
@@ -465,6 +567,43 @@ class _ModelCard extends StatelessWidget {
], ],
), ),
), ),
),
);
}
}
/// 封面上的小胶囊标签(版本 / 标签)。
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,13 +612,24 @@ 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,
+27 -2
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:
@@ -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 -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; }
+185 -40
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)
? Avatar
: string.IsNullOrWhiteSpace(Email)
? null ? null
: $"https://cdn-img.gitcode.com/avatar/{Convert.ToHexString( : $"https://cdn-img.gitcode.com/avatar/{Convert.ToHexString(
System.Security.Cryptography.MD5.HashData( System.Security.Cryptography.MD5.HashData(
System.Text.Encoding.UTF8.GetBytes(Email!.Trim().ToLowerInvariant()))) System.Text.Encoding.UTF8.GetBytes(Email!.Trim().ToLowerInvariant())))
.ToLowerInvariant()}"; .ToLowerInvariant()}";
public string DisplayName
{
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];
// 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://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;
} }
} }