feat: 模型回退 Avalonia 独立窗口;积分精确到 0.01;人品值/二选一接入后端计费

模型(回退 Flutter 内嵌 → Avalonia):
- 恢复 model/_sdk、5 个模型 src/、GC-DRAW/PlayerWindow、ModelHost/AvaloniaHost(源自 5b62897)
- FlutterShell 主线程承载 Avalonia 事件循环,根治 1.1.1 的 AppKit 崩溃
- /api/models/{id}/launch 由后端开独立 Avalonia 窗口
- 前端删除 Flutter 模型实现与 ModelViewPage 死代码(13 个文件)

积分:
- Points/ThemePaid int → decimal,精确到 0.01;pw.yaml 兼容旧整数格式
- 主题色退款保留 2 位小数;前端新增 formatPoints 显示

人品值/二选一计费(原前端本地免费随机 → 后端计费):
- 新增 POST /api/user/fortune、/api/user/pick,随机数与扣费都在服务端
- 人品值阶梯:当日免费 1 次 → 0.1×5 → 0.2×5 → 0.5×15 → 1.0 起
- 二选一:当日免费 1 次 → 0.5/次;计数按 UTC 日期持久化,跨天清零
- 前端两个功能需登录,扣费后提示本次消耗

附 RELEASE-1.1.2.md 更新日志。
This commit is contained in:
远影科技 committed 2026-11-21 21:51:34 +08:00
1 parent 38781c9807
commit cfd6809714
57 files changed
+8300 -1966

No files matched your search

+3
View File
@@ -135,6 +135,9 @@ public sealed record LoginRequest(string Username, string Password);
/// <summary>换主题色:只传颜色,价格由服务端按预置/自定义判定。</summary>
public sealed record ThemeRequest(string Color, int? Cost = null);
/// <summary>二选一:两个候选选项,服务端随机挑一个并计费。</summary>
public sealed record PickRequest(string OptionA, string OptionB);
public sealed record CaptchaDto(string Id, string Question);
+180
View File
@@ -0,0 +1,180 @@
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();
}
}
+74 -3
View File
@@ -36,15 +36,26 @@ public static class BackendServer
/// 构建后端。返回的 <see cref="WebApplication"/> 尚未启动:
/// 独立进程直接 <c>Run()</c>,启动器用 <c>StartAsync()</c> 之后继续拉起界面。
///
/// 模型渲染已全部交给 Flutter,本进程只提供 HTTP API,不再有窗口宿主。
/// 界面是 Flutter,但**模型窗口仍由 Avalonia 承载**(模型契约返回的是 Avalonia Control)。
/// </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 userService = new UserService(services.Paths.HomeRoot);
var host = new AvaloniaHost(services);
uiHost = host;
var builder = WebApplication.CreateBuilder(new WebApplicationOptions { Args = args });
builder.Logging.ClearProviders();
@@ -214,6 +225,20 @@ public static class BackendServer
await next();
});
// 人品值评语(与前端 FortuneResult.commentFor 保持一致)
static string FortuneComment(int value)
{
if (value >= 96) return "欧皇附体,今天买彩票吧";
if (value >= 90) return "运气爆棚,适合干大事";
if (value >= 80) return "手气不错,稳";
if (value >= 65) return "中上水平,稍微努一下";
if (value >= 50) return "普普通通,够用";
if (value >= 35) return "有点背,低调点";
if (value >= 20) return "今天别赌任何东西";
if (value >= 8) return "极差,建议躺平";
return "非酋之王,明天再来";
}
// 统一的用户响应体:前端一次拿齐签到 / 主题色需要的所有字段
object UserPayload(UserRecord r)
{
@@ -310,6 +335,42 @@ public static class BackendServer
});
});
app.MapPost("/api/user/fortune", (HttpContext ctx) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username))
return Results.Json(new { error = "未登录" }, statusCode: 401);
var ok = userService.RollFortune(username, out var err, out var value,
out var cost, out var rec);
if (!ok) return Results.BadRequest(new { error = err });
return Results.Ok(new {
value,
cost,
comment = FortuneComment(value),
user = UserPayload(rec!)
});
});
app.MapPost("/api/user/pick", (HttpContext ctx, PickRequest? req) =>
{
var username = ctx.Items["user"] as string;
if (string.IsNullOrEmpty(username))
return Results.Json(new { error = "未登录" }, statusCode: 401);
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
var ok = userService.PickOne(username, req.OptionA, req.OptionB, out var err,
out var choice, out var cost, out var rec);
if (!ok) return Results.BadRequest(new { error = err });
return Results.Ok(new {
choice,
cost,
user = UserPayload(rec!)
});
});
app.MapPost("/api/user/theme", (HttpContext ctx, ThemeRequest? req) =>
{
var username = ctx.Items["user"] as string;
@@ -355,13 +416,23 @@ app.MapGet("/api/health", () => Results.Ok(new HealthDto(
// 模型改为客户端内渲染(Flutter):这里只确认模型存在并把 id 交回去,
// 不再拉起 Avalonia 窗口。保留接口是为了老客户端不至于 404。
app.MapPost("/api/models/{id}/launch", (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);
if (package == null) return Results.NotFound(new LaunchResultDto(false, $"没有找到模型 {id}"));
return Results.Ok(new LaunchResultDto(true, $"在应用内打开 {package.Manifest.Name}"));
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);
}
});
app.MapDelete("/api/models/{id}", (string id) =>
+162 -15
View File
@@ -100,8 +100,9 @@ public sealed class UserService
{
var lines = yaml.Split('\n', StringSplitOptions.RemoveEmptyEntries);
string? username = null, pwHash = null, pwSalt = null, themeColor = null;
int points = 0, consecutiveDays = 0, themePaid = 0;
DateTime? lastSignIn = null, themePaidAt = null;
decimal points = 0, themePaid = 0;
int consecutiveDays = 0, fortuneCount = 0, pickCount = 0;
DateTime? lastSignIn = null, themePaidAt = null, fortuneDate = null, pickDate = null;
foreach (var line in lines)
{
@@ -114,16 +115,25 @@ public sealed class UserService
case "username": username = val; break;
case "pw_hash": pwHash = val; break;
case "pw_salt": pwSalt = val; break;
case "points": int.TryParse(val, out var p); points = p; break;
// 旧文件里积分是整数;decimal.TryParse 兼容读取
case "points": decimal.TryParse(val, out var p); points = p; break;
case "last_sign_in":
if (DateTime.TryParse(val, out var ls)) lastSignIn = ls;
break;
case "consecutive_days": int.TryParse(val, out var d); consecutiveDays = d; break;
case "theme_color": themeColor = val; break;
case "theme_paid": int.TryParse(val, out var tp); themePaid = tp; break;
case "theme_paid": decimal.TryParse(val, out var tp); themePaid = tp; break;
case "theme_paid_at":
if (DateTime.TryParse(val, out var ta)) themePaidAt = ta;
break;
case "fortune_date":
if (DateTime.TryParse(val, out var fd)) fortuneDate = fd;
break;
case "fortune_count": int.TryParse(val, out var fc); fortuneCount = fc; break;
case "pick_date":
if (DateTime.TryParse(val, out var pd)) pickDate = pd;
break;
case "pick_count": int.TryParse(val, out var pc); pickCount = pc; break;
}
}
@@ -132,7 +142,13 @@ public sealed class UserService
return new UserRecord(username!, pwHash, pwSalt, points, lastSignIn, consecutiveDays,
string.IsNullOrWhiteSpace(themeColor) ? DefaultThemeColor : themeColor,
themePaid, themePaidAt);
themePaid, themePaidAt)
{
FortuneDate = fortuneDate,
FortuneCount = fortuneCount,
PickDate = pickDate,
PickCount = pickCount
};
}
private void SaveUser(UserRecord rec)
@@ -146,12 +162,16 @@ public sealed class UserService
.AppendLine($"username: {rec.Username}")
.AppendLine($"pw_hash: {rec.PwHash}")
.AppendLine($"pw_salt: {rec.PwSalt}")
.AppendLine($"points: {rec.Points}")
.AppendLine($"points: {rec.Points.ToString("0.##")}")
.AppendLine($"last_sign_in: {rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""}")
.AppendLine($"consecutive_days: {rec.ConsecutiveDays}")
.AppendLine($"theme_color: {rec.ThemeColor ?? DefaultThemeColor}")
.AppendLine($"theme_paid: {rec.ThemePaid}")
.AppendLine($"theme_paid: {rec.ThemePaid.ToString("0.##")}")
.AppendLine($"theme_paid_at: {rec.ThemePaidAt?.ToString("o") ?? ""}")
.AppendLine($"fortune_date: {rec.FortuneDate?.ToString("yyyy-MM-dd") ?? ""}")
.AppendLine($"fortune_count: {rec.FortuneCount}")
.AppendLine($"pick_date: {rec.PickDate?.ToString("yyyy-MM-dd") ?? ""}")
.AppendLine($"pick_count: {rec.PickCount}")
.ToString();
File.WriteAllText(Path.Combine(dir, "pw.yaml"), yaml);
@@ -322,7 +342,7 @@ public sealed class UserService
public UserRecord? GetFirstUser() => _users.Values.FirstOrDefault();
public bool UpdatePoints(string username, int deltaPoints, out string error)
public bool UpdatePoints(string username, decimal deltaPoints, out string error)
{
error = "";
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
@@ -426,7 +446,7 @@ public sealed class UserService
/// 换主题色。服务端自己算价,不信客户端传的 cost。
/// 上次购买在 1 小时内,先按 80% 退还上次花费。
/// </summary>
public bool ChangeThemeColor(string username, string colorHex, out string error, out int refunded)
public bool ChangeThemeColor(string username, string colorHex, out string error, out decimal refunded)
{
error = "";
refunded = 0;
@@ -457,12 +477,12 @@ public sealed class UserService
return false;
}
// 1 小时内换色:退回上次花费的 80%
// 1 小时内换色:退回上次花费的 80%(保留 2 位小数)
var available = rec.Points;
if (rec.ThemePaid > 0 && rec.ThemePaidAt.HasValue &&
DateTime.UtcNow - rec.ThemePaidAt.Value <= RefundWindow)
{
refunded = (int)Math.Floor(rec.ThemePaid * RefundRate);
refunded = Math.Floor(rec.ThemePaid * (decimal)RefundRate * 100) / 100;
available += refunded;
}
@@ -490,6 +510,119 @@ public sealed class UserService
return left > TimeSpan.Zero ? left : null;
}
// ---------------------------------------------------------------- 人品值 / 二选一
/// <summary>
/// 人品值当日费用。第一次免费;之后按当日已付费次数阶梯计费:
/// 第 1–5 次 0.1 / 第 6–10 次 0.2 / 第 11–25 次 0.5 / 第 26 次起 1。
/// </summary>
public static decimal FortuneCost(int paidIndexToday)
{
if (paidIndexToday <= 0) return 0m;
if (paidIndexToday <= 5) return 0.1m;
if (paidIndexToday <= 10) return 0.2m;
if (paidIndexToday <= 25) return 0.5m;
return 1m;
}
/// <summary>二选一当日费用:第一次免费,之后每次 0.5。</summary>
public static decimal PickCost(int paidIndexToday)
=> paidIndexToday <= 0 ? 0m : 0.5m;
/// <summary>算出当日费用并扣费;积分不足返回 false。成功后计数 +1。</summary>
private bool ChargeDailyFeature(UserRecord rec, Func<int, decimal> costFn,
DateTime? featureDate, int featureCount, out decimal cost, out string error)
{
error = "";
cost = 0;
var today = DateTime.UtcNow.Date;
// 跨天了先重置计数
if (featureDate.HasValue && featureDate.Value.Date != today)
featureCount = 0;
cost = costFn(featureCount);
if (rec.Points < cost)
{
error = cost > 0
? $"积分不足,本次需要 {cost.ToString("0.##")} 积分"
: "积分不足";
return false;
}
rec.Points = Math.Round(rec.Points - cost, 2);
return true;
}
/// <summary>
/// 摇一次人品值(服务端算随机数,客户端不信自己传的值)。
/// 当天第一次免费,之后按阶梯扣积分。
/// </summary>
public bool RollFortune(string username, out string error, out int value,
out decimal cost, out UserRecord? record)
{
error = "";
value = 0;
cost = 0;
record = null;
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
var today = DateTime.UtcNow.Date;
var count = rec.FortuneDate.HasValue && rec.FortuneDate.Value.Date == today
? rec.FortuneCount : 0;
if (!ChargeDailyFeature(rec, FortuneCost, rec.FortuneDate, count, out cost, out error))
return false;
rec.FortuneDate = today;
rec.FortuneCount = count + 1;
value = RandomNumberGenerator.GetInt32(0, 101);
record = rec;
SaveUser(rec);
return true;
}
/// <summary>二选一:服务端随机挑一个。当天第一次免费,之后每次 0.5。</summary>
public bool PickOne(string username, string optionA, string optionB, out string error,
out string choice, out decimal cost, out UserRecord? record)
{
error = "";
choice = "";
cost = 0;
record = null;
if (string.IsNullOrWhiteSpace(optionA) || string.IsNullOrWhiteSpace(optionB))
{
error = "两个选项都不能为空";
return false;
}
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
{
error = "用户不存在";
return false;
}
var today = DateTime.UtcNow.Date;
var count = rec.PickDate.HasValue && rec.PickDate.Value.Date == today
? rec.PickCount : 0;
if (!ChargeDailyFeature(rec, PickCost, rec.PickDate, count, out cost, out error))
return false;
rec.PickDate = today;
rec.PickCount = count + 1;
choice = RandomNumberGenerator.GetInt32(0, 2) == 0 ? optionA : optionB;
record = rec;
SaveUser(rec);
return true;
}
// ---------------------------------------------------------------- 散列
private static string GenerateSalt()
@@ -513,20 +646,34 @@ public class UserRecord
public string Username { get; init; } = "";
public string PwHash { get; init; } = "";
public string PwSalt { get; init; } = "";
public int Points { get; set; }
/// <summary>积分,精确到 0.01。</summary>
public decimal Points { get; set; }
public DateTime? LastSignIn { get; set; }
public int ConsecutiveDays { get; set; }
public string? ThemeColor { get; set; }
/// <summary>当前这个颜色实际花了多少分(用于 1 小时内退款)。</summary>
public int ThemePaid { get; set; }
public decimal ThemePaid { get; set; }
/// <summary>购买该颜色的时间(UTC)。</summary>
public DateTime? ThemePaidAt { get; set; }
public UserRecord(string username, string pwHash, string pwSalt, int points,
/// <summary>人品值当日最后计算日期(UTC),跨天计数清零。</summary>
public DateTime? FortuneDate { get; set; }
/// <summary>人品值当日已计算次数(含免费的那次)。</summary>
public int FortuneCount { get; set; }
/// <summary>二选一当日最后使用日期(UTC)。</summary>
public DateTime? PickDate { get; set; }
/// <summary>二选一当日已使用次数(含免费的那次)。</summary>
public int PickCount { get; set; }
public UserRecord(string username, string pwHash, string pwSalt, decimal points,
DateTime? lastSignIn, int consecutiveDays, string? themeColor = null,
int themePaid = 0, DateTime? themePaidAt = null)
decimal themePaid = 0, DateTime? themePaidAt = null)
{
Username = username;
PwHash = pwHash;