feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
前端
- 移除全部 Avalonia 依赖,模型渲染与界面统一改用 Flutter
- 新增用户页:登录/注册(SHA-512 + 盐)、签到积分(30 天一循环)、
主题色积分购买、二选一随机、今日人品
- 新增百宝箱页、模型内嵌渲染页、自绘标题栏(最小化/最大化/关闭)
- 下载页显示模型下载进度条,下载源读取加速
- 关于页新增「重新下载启动器」并在下载后做 sha256 完整性校验
- 修复浅色主题下标题栏不跟随主题色、无法连接后端等问题
后端
- 新增 UserService:.GC/user/<用户名>.yaml 存用户名/积分/SHA-512 口令,
登录返回 session token,本地 .GC/user/user.yaml 保存登录态
- 新增 /api/user/{register,login,me,signin,theme} 接口
- 去掉 Avalonia 窗口宿主,后端只提供 HTTP API
下载源
- 新增 GitHub 镜像源(Morris-morris-cloud/GC),与 Xhmcl 并发测速
- 单源探测超时收紧到 2 秒,取最快且可用的源;GitHub 复用 GiteaRemote
(contents 带 ref、releases 带 per_page=100)
构建与 CI
- macOS 上默认只出 macOS 包,Windows 交给原生 Windows 构建
- 修复 Windows 交叉编译中 flutter-cpp-client-wrapper 双层目录嵌套
- 新增 GitHub Actions:
· nightly-prerelease:每天 21:00 编译三平台,发布 nightly 预发布
· build-bot:Issue/PR 评论 @build-bot build <mac|win-amd|win-arm|all>,
发布 ip-prerelease 预发布
· pr-review:检查能否编译、静态分析、合并冲突、是否落后 main
- 忽略 79MB 课件产物等高线.html 与工具链临时备份
This commit is contained in:
1 parent
b9cb56cb8b
commit
ea1fa6b6d1
134 files changed
+4309
-16614
No files matched your search
@@ -123,6 +123,19 @@ public sealed record UpdateCheckDto(
|
||||
|
||||
public sealed record ContributorDto(string Name, int Contributions, string? AvatarUrl);
|
||||
|
||||
// ---- 用户 API DTO ----
|
||||
public sealed record RegisterRequest(string Username, string Password);
|
||||
public sealed record LoginRequest(string Username, string Password);
|
||||
public sealed record ThemeRequest(string Color, int Cost);
|
||||
|
||||
|
||||
/// <summary>「重新下载启动器」结果:State = Ready / UpToDate / Failed。</summary>
|
||||
public sealed record LauncherRedownloadDto(
|
||||
string State,
|
||||
string Version,
|
||||
string Message,
|
||||
IReadOnlyList<string> Steps);
|
||||
|
||||
public sealed record AboutDto(
|
||||
string AppName,
|
||||
string Version,
|
||||
|
||||
@@ -1,180 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
using Avalonia.Threading;
|
||||
using GC.Models;
|
||||
using GC.Services;
|
||||
using GC.Views;
|
||||
|
||||
namespace GC.UI.Server;
|
||||
|
||||
/// <summary>
|
||||
/// 模型窗口宿主。
|
||||
///
|
||||
/// 为什么渲染这一层留在 .NET:模型 dll 通过 <c>IModelRuntime.CreateView</c> 返回的是
|
||||
/// Avalonia <see cref="Control"/>,这是模型契约的一部分。把渲染栈换成 Flutter 等于换掉契约,
|
||||
/// 所有已发布模型都会失效。所以前后端分离的切法是:
|
||||
/// · 界面(首页 / 下载 / 设置 / 关于)→ Flutter 前端
|
||||
/// · 模型窗口(模型自带界面)→ 仍由 .NET 承载,前端只发一条「启动模型」的指令
|
||||
///
|
||||
/// 这里惰性启动一个没有主窗口的 Avalonia 桌面生命周期,之后所有模型窗口都在它的 UI 线程上创建。
|
||||
/// 无桌面会话(CI / 无头环境)时启动会失败,此时只有「启动模型」不可用,其余接口照常工作。
|
||||
/// </summary>
|
||||
public sealed class AvaloniaHost
|
||||
{
|
||||
private readonly AppServices _services;
|
||||
private readonly object _gate = new();
|
||||
private readonly Dictionary<string, PlayerWindow> _windows = new(StringComparer.OrdinalIgnoreCase);
|
||||
private readonly TaskCompletionSource<bool> _ready =
|
||||
new(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
private int _started;
|
||||
|
||||
public AvaloniaHost(AppServices services) => _services = services;
|
||||
|
||||
public bool IsAvailable { get; private set; }
|
||||
|
||||
public string? LastError { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// 后端线程调用:等待「主线程已把 Avalonia 事件循环跑起来」。
|
||||
///
|
||||
/// 关键点:macOS 的 AppKit 要求 NSApplication 在**主线程**。以前这里把
|
||||
/// <c>StartWithClassicDesktopLifetime</c> 丢到一个新建的后台线程里跑,在 macOS 上
|
||||
/// 会直接崩掉整个后端进程(表现为点「启动模型」界面无反应、随后后端消失)。
|
||||
/// 现在改为由启动器在主线程调用 <see cref="RunOnCurrentThread"/>,
|
||||
/// 这里只等待就绪信号。
|
||||
/// </summary>
|
||||
public Task<bool> EnsureStartedAsync() => _ready.Task;
|
||||
|
||||
/// <summary>
|
||||
/// 必须在 UI 主线程调用。启动 Avalonia 桌面生命周期并阻塞,直到 <see cref="Shutdown"/>。
|
||||
/// 返回后(或初始化失败后)调用方负责收尾。
|
||||
/// </summary>
|
||||
public void RunOnCurrentThread()
|
||||
{
|
||||
if (Interlocked.Exchange(ref _started, 1) == 1) return;
|
||||
|
||||
try
|
||||
{
|
||||
AppBuilder.Configure<HostApp>()
|
||||
.UsePlatformDetect()
|
||||
.AfterSetup(_ =>
|
||||
{
|
||||
IsAvailable = true;
|
||||
_ready.TrySetResult(true);
|
||||
})
|
||||
.StartWithClassicDesktopLifetime(Array.Empty<string>());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 无桌面会话(CI / 无头环境):模型窗口不可用,但后端其余接口照常。
|
||||
LastError = ex.Message;
|
||||
_ready.TrySetResult(false);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>从任意线程请求结束事件循环,使 <see cref="RunOnCurrentThread"/> 返回。</summary>
|
||||
public void Shutdown()
|
||||
{
|
||||
if (_started == 0) return;
|
||||
try
|
||||
{
|
||||
Dispatcher.UIThread.Post(() =>
|
||||
{
|
||||
if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||
desktop.Shutdown();
|
||||
});
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 事件循环尚未建立或已退出:无需处理
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>在 Avalonia UI 线程上加载模型并打开它自己的窗口。</summary>
|
||||
public async Task<string> LaunchAsync(ModelPackage package)
|
||||
{
|
||||
if (!await EnsureStartedAsync().ConfigureAwait(false))
|
||||
throw new InvalidOperationException(
|
||||
LastError ?? "无法初始化图形环境(当前会话没有桌面?)");
|
||||
|
||||
return await Dispatcher.UIThread.InvokeAsync<string>(async () =>
|
||||
{
|
||||
// 同一个模型已经在运行:把已有窗口提到前台,不再加载第二份实例
|
||||
// (连点「启动模型」会各占一份内存与显存,低配机器直接卡死)。
|
||||
lock (_gate)
|
||||
{
|
||||
if (_windows.TryGetValue(package.Id, out var existing))
|
||||
{
|
||||
try
|
||||
{
|
||||
if (existing.WindowState == WindowState.Minimized)
|
||||
existing.WindowState = WindowState.Normal;
|
||||
existing.Activate();
|
||||
return $"模型 {package.Id} 已在运行";
|
||||
}
|
||||
catch
|
||||
{
|
||||
// 窗口已失效:清掉记录,按新窗口重新打开
|
||||
_windows.Remove(package.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PlayerWindow? window = null;
|
||||
LoadedModel? loaded = null;
|
||||
try
|
||||
{
|
||||
Action requestClose = () => Dispatcher.UIThread.Post(() =>
|
||||
{
|
||||
try { window?.Close(); } catch { /* 已关闭 */ }
|
||||
});
|
||||
|
||||
loaded = await _services.ModelHost.LoadAsync(package, requestClose, null);
|
||||
|
||||
window = new PlayerWindow(package, loaded);
|
||||
var captured = loaded;
|
||||
var id = package.Id;
|
||||
window.Closed += (_, _) =>
|
||||
{
|
||||
try { captured.Dispose(); } catch { /* 释放失败不影响退出 */ }
|
||||
lock (_gate)
|
||||
{
|
||||
if (_windows.TryGetValue(id, out var current) && ReferenceEquals(current, window))
|
||||
_windows.Remove(id);
|
||||
}
|
||||
};
|
||||
|
||||
lock (_gate) _windows[id] = window;
|
||||
window.Show();
|
||||
return $"已启动模型 {package.Id}";
|
||||
}
|
||||
catch
|
||||
{
|
||||
try { loaded?.Dispose(); } catch { /* 忽略 */ }
|
||||
throw;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>后端自己的 Avalonia 应用:没有主窗口,只用来承载模型窗口。</summary>
|
||||
internal sealed class HostApp : Application
|
||||
{
|
||||
public override void Initialize() { }
|
||||
|
||||
public override void OnFrameworkInitializationCompleted()
|
||||
{
|
||||
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||
{
|
||||
desktop.ShutdownMode = ShutdownMode.OnExplicitShutdown;
|
||||
desktop.MainWindow = null;
|
||||
}
|
||||
|
||||
base.OnFrameworkInitializationCompleted();
|
||||
}
|
||||
}
|
||||
@@ -30,33 +30,21 @@ public static class BackendServer
|
||||
{
|
||||
/// <summary>按命令行 / GC_UI_PORT 解析端口并构建(未启动)的后端。</summary>
|
||||
public static WebApplication StartFromCommandLine(string[] args)
|
||||
=> Start(args, ResolvePort(args), out _);
|
||||
|
||||
/// <summary>同上,并交出模型窗口宿主(独立进程入口用:主线程留给 Avalonia)。</summary>
|
||||
public static WebApplication StartFromCommandLine(string[] args, out AvaloniaHost uiHost)
|
||||
=> Start(args, ResolvePort(args), out uiHost);
|
||||
=> Start(args, ResolvePort(args));
|
||||
|
||||
/// <summary>
|
||||
/// 构建后端。返回的 <see cref="WebApplication"/> 尚未启动:
|
||||
/// 独立进程直接 <c>Run()</c>,启动器用 <c>StartAsync()</c> 之后继续拉起界面。
|
||||
///
|
||||
/// 模型渲染已全部交给 Flutter,本进程只提供 HTTP API,不再有窗口宿主。
|
||||
/// </summary>
|
||||
public static WebApplication Start(string[] args, int port)
|
||||
=> Start(args, port, out _);
|
||||
|
||||
/// <summary>
|
||||
/// 构建后端,并通过 <paramref name="uiHost"/> 交出模型窗口宿主。
|
||||
///
|
||||
/// 调用方(启动器)必须在**主线程**调用 <see cref="AvaloniaHost.RunOnCurrentThread"/>:
|
||||
/// macOS 的 AppKit 要求 NSApplication 运行在主线程,否则打开模型窗口时整个进程会崩溃。
|
||||
/// </summary>
|
||||
public static WebApplication Start(string[] args, int port, out AvaloniaHost uiHost)
|
||||
{
|
||||
// 下载模块(GC-DOWNLOAD)通过宿主钩子注入,和 GC-BOOT 的做法一致。
|
||||
DownloadModuleHost.Factory = new DownloadModuleFactory();
|
||||
|
||||
var services = AppServices.Create();
|
||||
var host = new AvaloniaHost(services);
|
||||
uiHost = host;
|
||||
var userService = new UserService(services.Paths.HomeRoot);
|
||||
|
||||
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
|
||||
builder.Logging.ClearProviders();
|
||||
@@ -200,12 +188,106 @@ public static class BackendServer
|
||||
|
||||
// ---- 健康检查 -------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
|
||||
// ---- 用户系统 -----------------------------------------------------------------
|
||||
|
||||
// 简单 session 存储:key = username(lower), value = session token
|
||||
var userSessions = new System.Collections.Concurrent.ConcurrentDictionary<string, string>();
|
||||
|
||||
// 中间件:从 header 提取当前用户
|
||||
app.Use(async (context, next) =>
|
||||
{
|
||||
context.Items["user"] = null as string;
|
||||
if (context.Request.Headers.TryGetValue("X-User-Token", out var tokens) && tokens.Count > 0)
|
||||
{
|
||||
var token = tokens[0];
|
||||
foreach (var kv in userSessions)
|
||||
{
|
||||
if (kv.Value == token)
|
||||
{
|
||||
context.Items["user"] = kv.Key;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
await next();
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/register", (RegisterRequest? req) => {
|
||||
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
|
||||
if (string.IsNullOrWhiteSpace(req.Username)) return Results.BadRequest(new { error = "用户名不能为空" });
|
||||
if (string.IsNullOrWhiteSpace(req.Password)) return Results.BadRequest(new { error = "密码不能为空" });
|
||||
var ok = userService.Register(req.Username, req.Password, out var err);
|
||||
return ok ? Results.Ok(new { message = "注册成功" }) : Results.BadRequest(new { error = err });
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/login", (LoginRequest? req) => {
|
||||
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
|
||||
var ok = userService.Login(req.Username, req.Password, out var err, out var rec);
|
||||
if (!ok) return Results.BadRequest(new { error = err });
|
||||
// 生成 session token
|
||||
var sessionToken = Convert.ToBase64String(System.Security.Cryptography.RandomNumberGenerator.GetBytes(32)).Replace("/", "_").Replace("+", "-").Substring(0, 32);
|
||||
userSessions[rec!.Username.ToLower()] = sessionToken;
|
||||
return Results.Ok(new {
|
||||
username = rec.Username,
|
||||
points = rec.Points,
|
||||
consecutive_days = rec.ConsecutiveDays,
|
||||
last_sign_in = rec.LastSignIn?.ToString("yyyy-MM-dd") ?? "",
|
||||
theme_color = rec.ThemeColor ?? "",
|
||||
session_token = sessionToken
|
||||
});
|
||||
});
|
||||
|
||||
app.MapGet("/api/user/me", (HttpContext ctx) =>
|
||||
{
|
||||
var username = ctx.Items["user"] as string;
|
||||
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
|
||||
return Results.Json(new { error = "未登录" }, statusCode: 401);
|
||||
return Results.Ok(new {
|
||||
username = rec.Username,
|
||||
points = rec.Points,
|
||||
consecutive_days = rec.ConsecutiveDays,
|
||||
last_sign_in = rec.LastSignIn?.ToString("yyyy-MM-dd") ?? "",
|
||||
theme_color = rec.ThemeColor ?? ""
|
||||
});
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/signin", (HttpContext ctx) =>
|
||||
{
|
||||
var username = ctx.Items["user"] as string;
|
||||
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
|
||||
return Results.Json(new { error = "未登录" }, statusCode: 401);
|
||||
var ok = userService.UpdateSignIn(username, out var err);
|
||||
if (!ok)
|
||||
{
|
||||
if (err == "今日已签到")
|
||||
return Results.Ok(new { message = err, points = rec.Points, consecutive_days = rec.ConsecutiveDays });
|
||||
return Results.BadRequest(new { error = err });
|
||||
}
|
||||
return Results.Ok(new {
|
||||
points = rec.Points,
|
||||
consecutive_days = rec.ConsecutiveDays,
|
||||
reward = userService.GetSignInReward(rec.ConsecutiveDays),
|
||||
last_sign_in = rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""
|
||||
});
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/theme", (HttpContext ctx, ThemeRequest? req) =>
|
||||
{
|
||||
var username = ctx.Items["user"] as string;
|
||||
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
|
||||
return Results.Json(new { error = "未登录" }, statusCode: 401);
|
||||
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
|
||||
var ok = userService.ChangeThemeColor(username, req.Color, req.Cost, out var err);
|
||||
return ok ? Results.Ok(new { message = "主题已更新", points = rec.Points, theme_color = rec.ThemeColor }) : Results.BadRequest(new { error = err });
|
||||
});
|
||||
|
||||
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
|
||||
true,
|
||||
LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
LauncherRuntimeInfo.CurrentRid,
|
||||
host.IsAvailable,
|
||||
host.LastError,
|
||||
// 界面在客户端内渲染,后端不存在「窗口宿主不可用」的状态
|
||||
true,
|
||||
(string?)null,
|
||||
GcUiContract.DeriveSessionProof(sessionToken))));
|
||||
|
||||
// ---- 已安装模型 -----------------------------------------------------------
|
||||
@@ -225,24 +307,15 @@ public static class BackendServer
|
||||
return Results.File(package.PreviewPath, GuessImageContentType(package.PreviewPath));
|
||||
});
|
||||
|
||||
app.MapPost("/api/models/{id}/launch", async (string id) =>
|
||||
// 模型改为客户端内渲染(Flutter):这里只确认模型存在并把 id 交回去,
|
||||
// 不再拉起 Avalonia 窗口。保留接口是为了老客户端不至于 404。
|
||||
app.MapPost("/api/models/{id}/launch", (string id) =>
|
||||
{
|
||||
if (!IsSafeId(id)) return Results.BadRequest(new LaunchResultDto(false, "模型标识无效"));
|
||||
var package = services.Models.Find(id);
|
||||
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
|
||||
|
||||
try
|
||||
{
|
||||
services.Memory.Refresh();
|
||||
var message = await host.LaunchAsync(package);
|
||||
return Results.Ok(new LaunchResultDto(true, message));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 细节只写日志,不回显给调用方,避免泄漏本机路径等内部信息。
|
||||
Console.Error.WriteLine($"[launch] 启动模型 {id} 失败: {ex}");
|
||||
return Results.Json(new LaunchResultDto(false, "模型启动失败,请查看后端日志"), statusCode: 503);
|
||||
}
|
||||
return Results.Ok(new LaunchResultDto(true, $"在应用内打开 {package.Manifest.Name}"));
|
||||
});
|
||||
|
||||
app.MapDelete("/api/models/{id}", (string id) =>
|
||||
@@ -435,6 +508,45 @@ public static class BackendServer
|
||||
.ToList()));
|
||||
});
|
||||
|
||||
// ---- 重新下载启动器 -------------------------------------------------------
|
||||
// 「关于」页的按钮:本地程序文件被误删 / 损坏后,重新拉一份发布包。
|
||||
// DownloadAsync 内部会按清单里的 sha256 逐块校验,清单缺 sha256 直接拒绝下载,
|
||||
// 所以「下载完确认完整性」是这条链路的固有动作,不是这里另加的一次比对。
|
||||
app.MapPost("/api/launcher/redownload", async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var fastest = await services.Selector.PickFastestAsync(false, CancellationToken.None);
|
||||
services.Updates.UseRemote(services.DownloadModule.CreateRemote(fastest));
|
||||
|
||||
var steps = new List<string>();
|
||||
var progress = new Progress<UpdateProgressInfo>(p =>
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(p.Stage)) return;
|
||||
lock (steps) steps.Add(p.Stage);
|
||||
});
|
||||
|
||||
var result = await services.LauncherUpdates.DownloadAsync(
|
||||
services.Paths, services.Updates.Remote, progress, CancellationToken.None);
|
||||
|
||||
lock (steps)
|
||||
{
|
||||
return Results.Ok(new LauncherRedownloadDto(
|
||||
result.State.ToString(),
|
||||
result.Version,
|
||||
result.Message,
|
||||
steps.ToList()));
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.Error.WriteLine($"[launcher] 重新下载失败: {ex}");
|
||||
return Results.Json(
|
||||
ErrorDto.Of($"重新下载启动器失败:{ex.Message}"),
|
||||
statusCode: 503);
|
||||
}
|
||||
});
|
||||
|
||||
// ---- 关于 -----------------------------------------------------------------
|
||||
|
||||
app.MapGet("/api/about", async () =>
|
||||
@@ -497,7 +609,7 @@ public static class BackendServer
|
||||
|
||||
// ---- 启动 -----------------------------------------------------------------
|
||||
|
||||
WriteEndpointFile(services, port);
|
||||
WriteEndpointFile(services, port, sessionToken);
|
||||
Console.WriteLine($"[GC-UI] 后端已启动: http://127.0.0.1:{port}");
|
||||
Console.WriteLine($"[GC-UI] 模型库: {services.Paths.ModelRoot}");
|
||||
|
||||
@@ -509,7 +621,7 @@ public static class BackendServer
|
||||
|
||||
|
||||
|
||||
static void WriteEndpointFile(AppServices services, int port)
|
||||
static void WriteEndpointFile(AppServices services, int port, string? token)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -521,10 +633,19 @@ public static class BackendServer
|
||||
url = $"http://127.0.0.1:{port}",
|
||||
version = LauncherRuntimeInfo.CurrentLauncherVersion,
|
||||
platform = LauncherRuntimeInfo.CurrentRid,
|
||||
startedAt = DateTimeOffset.UtcNow.ToString("o")
|
||||
startedAt = DateTimeOffset.UtcNow.ToString("o"),
|
||||
// 令牌也写进来:前端如果是被 Finder 直接打开(没有继承环境变量),
|
||||
// 只能从这里拿到会话令牌,否则每个 /api 都会 401 —— 表现为「无法连接后端」。
|
||||
token
|
||||
}, new JsonSerializerOptions { WriteIndented = true });
|
||||
|
||||
File.WriteAllText(file, payload);
|
||||
if (!OperatingSystem.IsWindows())
|
||||
{
|
||||
// 同机其他用户不该读到会话令牌
|
||||
try { File.SetUnixFileMode(file, UnixFileMode.UserRead | UnixFileMode.UserWrite); }
|
||||
catch { /* 文件系统不支持时忽略 */ }
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
· 后端(本工程):模型扫描 / 下载 / 更新 / 设置 / 模型窗口宿主,只暴露本地 HTTP API
|
||||
· 前端(GC-UI/frontend,Flutter):只做界面,通过 HTTP 调后端
|
||||
|
||||
模型窗口仍然由 .NET 侧承载:模型 dll 返回的是 Avalonia Control,
|
||||
换掉渲染栈等于换掉模型契约,所以「渲染留在 .NET,界面交给 Flutter」是唯一不破坏模型生态的切法。
|
||||
模型渲染也已并入 Flutter(lib/models/):模型不再返回 Avalonia Control,
|
||||
后端只剩纯 HTTP API,不再依赖任何 UI 框架。
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
@@ -15,16 +15,10 @@
|
||||
<RootNamespace>GC.UI.Server</RootNamespace>
|
||||
<AssemblyName>GC.UI.Server</AssemblyName>
|
||||
<InvariantGlobalization>false</InvariantGlobalization>
|
||||
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
|
||||
<!-- 后端是本地伴随进程,不需要浏览器启动配置 / 静态文件 -->
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\GC\src\GC.Core.csproj" />
|
||||
<ProjectReference Include="..\..\..\GC-DOWNLOAD\GC-DOWNLOAD.csproj" />
|
||||
|
||||
@@ -1,22 +1,8 @@
|
||||
using GC.UI.Server;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
// 独立进程入口:`GC.UI.Server --port 17890`
|
||||
// 启动器在进程内直接调用 BackendServer.Start,不会走到这里。
|
||||
var app = BackendServer.StartFromCommandLine(args, out var host);
|
||||
var app = BackendServer.StartFromCommandLine(args);
|
||||
|
||||
// 模型窗口由 Avalonia 承载,macOS 的 AppKit 要求 NSApplication 在主线程。
|
||||
// 所以后端交给 Kestrel 自己的线程池在后台跑,主线程留给 Avalonia 事件循环。
|
||||
app.StartAsync().GetAwaiter().GetResult();
|
||||
host.RunOnCurrentThread();
|
||||
|
||||
if (host.IsAvailable)
|
||||
{
|
||||
// 事件循环结束 → 收尾后端
|
||||
app.StopAsync().GetAwaiter().GetResult();
|
||||
}
|
||||
else
|
||||
{
|
||||
// 无图形环境(无头调试):退化为纯后端常驻
|
||||
app.WaitForShutdown();
|
||||
}
|
||||
// 纯 HTTP 后端(模型渲染在 Flutter 客户端里),跑起来常驻即可。
|
||||
app.Run();
|
||||
@@ -0,0 +1,261 @@
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
namespace GC.UI.Server;
|
||||
|
||||
/// <summary>
|
||||
/// 本地用户系统:用户名/密码/积分,数据存在 .GC/user/ 目录。
|
||||
/// </summary>
|
||||
public sealed class UserService
|
||||
{
|
||||
private readonly string _userDir;
|
||||
public readonly ConcurrentDictionary<string, UserRecord> _users = new();
|
||||
|
||||
public UserService(string homeRoot)
|
||||
{
|
||||
_userDir = Path.Combine(homeRoot, "user");
|
||||
Directory.CreateDirectory(_userDir);
|
||||
LoadAll();
|
||||
}
|
||||
|
||||
private void LoadAll()
|
||||
{
|
||||
foreach (var file in Directory.GetFiles(_userDir, "*.yaml"))
|
||||
{
|
||||
try
|
||||
{
|
||||
var username = Path.GetFileNameWithoutExtension(file);
|
||||
var content = File.ReadAllText(file);
|
||||
var rec = DeserializeUser(username, content);
|
||||
if (rec != null) _users[username] = rec;
|
||||
}
|
||||
catch { /* 忽略损坏文件 */ }
|
||||
}
|
||||
}
|
||||
|
||||
private UserRecord? DeserializeUser(string username, string yaml)
|
||||
{
|
||||
var lines = yaml.Split('\n', StringSplitOptions.RemoveEmptyEntries);
|
||||
string? pwHash = null, pwSalt = null;
|
||||
int points = 0;
|
||||
DateTime? lastSignIn = null;
|
||||
int consecutiveDays = 0;
|
||||
string? themeColor = null;
|
||||
|
||||
foreach (var line in lines)
|
||||
{
|
||||
var parts = line.Split(':', 2);
|
||||
if (parts.Length != 2) continue;
|
||||
var key = parts[0].Trim();
|
||||
var val = parts[1].Trim();
|
||||
switch (key)
|
||||
{
|
||||
case "pw_hash": pwHash = val; break;
|
||||
case "pw_salt": pwSalt = val; break;
|
||||
case "points": points = int.TryParse(val, out var p) ? p : 0; break;
|
||||
case "last_sign_in":
|
||||
if (DateTime.TryParse(val, out var ls)) lastSignIn = ls;
|
||||
break;
|
||||
case "consecutive_days": consecutiveDays = int.TryParse(val, out var d) ? d : 0; break;
|
||||
case "theme_color": themeColor = val; break;
|
||||
}
|
||||
}
|
||||
|
||||
if (pwHash == null || pwSalt == null) return null;
|
||||
return new UserRecord(username, pwHash, pwSalt, points, lastSignIn, consecutiveDays, themeColor);
|
||||
}
|
||||
|
||||
public bool Register(string username, string password, out string error)
|
||||
{
|
||||
error = "";
|
||||
if (string.IsNullOrWhiteSpace(username) || username.Length > 20)
|
||||
{
|
||||
error = "用户名无效";
|
||||
return false;
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(password) || password.Length < 6)
|
||||
{
|
||||
error = "密码至少6位";
|
||||
return false;
|
||||
}
|
||||
if (_users.ContainsKey(username.ToLower()))
|
||||
{
|
||||
error = "用户名已存在";
|
||||
return false;
|
||||
}
|
||||
|
||||
var salt = GenerateSalt();
|
||||
var hash = HashPassword(password, salt);
|
||||
var rec = new UserRecord(username, hash, salt, 0, null, 0, null);
|
||||
_users[username.ToLower()] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool Login(string username, string password, out string error, out UserRecord? record)
|
||||
{
|
||||
error = "";
|
||||
record = null;
|
||||
if (!_users.TryGetValue(username.ToLower(), out var rec))
|
||||
{
|
||||
error = "用户名或密码错误";
|
||||
return false;
|
||||
}
|
||||
var hash = HashPassword(password, rec.PwSalt);
|
||||
if (hash != rec.PwHash)
|
||||
{
|
||||
error = "用户名或密码错误";
|
||||
return false;
|
||||
}
|
||||
record = rec;
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool UpdatePoints(string username, int deltaPoints, out string error)
|
||||
{
|
||||
error = "";
|
||||
if (!_users.TryGetValue(username, out var rec))
|
||||
{
|
||||
error = "用户不存在";
|
||||
return false;
|
||||
}
|
||||
rec.Points = Math.Max(0, rec.Points + deltaPoints);
|
||||
_users[username] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool UpdateSignIn(string username, out string error)
|
||||
{
|
||||
error = "";
|
||||
if (!_users.TryGetValue(username, out var rec))
|
||||
{
|
||||
error = "用户不存在";
|
||||
return false;
|
||||
}
|
||||
|
||||
var today = DateTime.UtcNow.Date;
|
||||
if (rec.LastSignIn.HasValue)
|
||||
{
|
||||
var last = rec.LastSignIn.Value.Date;
|
||||
var diff = (today - last).Days;
|
||||
if (diff == 0)
|
||||
{
|
||||
error = "今日已签到";
|
||||
return false;
|
||||
}
|
||||
if (diff == 1)
|
||||
{
|
||||
rec.ConsecutiveDays++;
|
||||
}
|
||||
else
|
||||
{
|
||||
rec.ConsecutiveDays = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rec.ConsecutiveDays = 1;
|
||||
}
|
||||
rec.LastSignIn = today;
|
||||
|
||||
var cycleDay = (rec.ConsecutiveDays - 1) % 30 + 1;
|
||||
int reward = GetSignInReward(cycleDay);
|
||||
rec.Points += reward;
|
||||
|
||||
_users[username] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
public int GetSignInReward(int day)
|
||||
{
|
||||
if (day <= 7) return 10;
|
||||
if (day <= 15) return 20;
|
||||
return 30;
|
||||
}
|
||||
|
||||
public UserRecord? GetFirstUser()
|
||||
{
|
||||
return _users.Values.FirstOrDefault();
|
||||
}
|
||||
|
||||
public bool TryGetUser(string username, out UserRecord? record)
|
||||
{
|
||||
return _users.TryGetValue(username.ToLower(), out record);
|
||||
}
|
||||
|
||||
public bool ChangeThemeColor(string username, string colorHex, int cost, out string error)
|
||||
{
|
||||
error = "";
|
||||
if (!_users.TryGetValue(username, out var rec))
|
||||
{
|
||||
error = "用户不存在";
|
||||
return false;
|
||||
}
|
||||
if (rec.Points < cost)
|
||||
{
|
||||
error = "积分不足";
|
||||
return false;
|
||||
}
|
||||
rec.Points -= cost;
|
||||
rec.ThemeColor = colorHex;
|
||||
_users[username] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
private void SaveUser(UserRecord rec)
|
||||
{
|
||||
try
|
||||
{
|
||||
var file = Path.Combine(_userDir, $"{rec.Username.ToLower()}.yaml");
|
||||
var yaml = $"username: {rec.Username}\npw_hash: {rec.PwHash}\npw_salt: {rec.PwSalt}\npoints: {rec.Points}\nlast_sign_in: {rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""}\nconsecutive_days: {rec.ConsecutiveDays}\ntheme_color: {rec.ThemeColor ?? ""}\n";
|
||||
File.WriteAllText(file, yaml);
|
||||
}
|
||||
catch { /* 忽略写入失败 */ }
|
||||
}
|
||||
|
||||
private static string GenerateSalt()
|
||||
{
|
||||
var bytes = new byte[16];
|
||||
using var rng = RandomNumberGenerator.Create();
|
||||
rng.GetBytes(bytes);
|
||||
return Convert.ToBase64String(bytes);
|
||||
}
|
||||
|
||||
private static string HashPassword(string password, string salt)
|
||||
{
|
||||
using var sha512 = SHA512.Create();
|
||||
var combined = Encoding.UTF8.GetBytes(password + ":" + salt);
|
||||
var hash = sha512.ComputeHash(combined);
|
||||
return Convert.ToBase64String(hash);
|
||||
}
|
||||
}
|
||||
|
||||
public class UserRecord
|
||||
{
|
||||
public string Username { get; init; } = "";
|
||||
public string PwHash { get; init; } = "";
|
||||
public string PwSalt { get; init; } = "";
|
||||
public int Points { get; set; }
|
||||
public DateTime? LastSignIn { get; set; }
|
||||
public int ConsecutiveDays { get; set; }
|
||||
public string? ThemeColor { get; set; }
|
||||
|
||||
public UserRecord(string username, string pwHash, string pwSalt, int points, DateTime? lastSignIn, int consecutiveDays, string? themeColor = null)
|
||||
{
|
||||
Username = username;
|
||||
PwHash = pwHash;
|
||||
PwSalt = pwSalt;
|
||||
Points = points;
|
||||
LastSignIn = lastSignIn;
|
||||
ConsecutiveDays = consecutiveDays;
|
||||
ThemeColor = themeColor;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user