Morris
|
f64f2708a1
|
ci: 修 pr-review 日志路径不一致导致「(无日志)」
flutter 步骤在 GC-UI/frontend 下运行,tee 写到 ../flutter-analyze.log(= GC-UI/),
但汇总步骤在仓库根目录读 flutter-analyze.log,永远读不到。
改为统一用 $GITHUB_WORKSPACE 绝对路径;日志缺失时提示「步骤可能未执行」。
|
2026-11-21 19:37:43 +08:00 |
|
Morris
|
0d383f96fb
|
ci: 修正 pr-review 的冲突判断与静态分析阈值
- mergeable=true 表示「可以合并」,之前误当成冲突,改为 false 才算冲突
- mergeable 为 null 时多等几轮(GitHub 异步计算)
- flutter analyze 加 --no-fatal-infos --no-fatal-warnings:
仓库里有 44 条历史 warning/info,不该卡住合并,只让 error 失败
- 结论里区分「error 数」与「历史 warning/info 数」
|
2026-11-21 19:34:46 +08:00 |
|
Morris
|
ea1fa6b6d1
|
feat: 全面迁移到 Flutter + 新增 GitHub 源与 CI 流水线
PR 审核 / 后端编译 (pull_request) Waiting to run
PR 审核 / 前端检查(Flutter) (pull_request) Waiting to run
PR 审核 / 安全扫描 (pull_request) Waiting to run
前端
- 移除全部 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 与工具链临时备份
|
2026-11-21 19:18:58 +08:00 |
|
远影科技
|
b9cb56cb8b
|
fix: 清理误提交的构建产物和临时脚本,补充 .gitignore
|
2026-11-21 09:48:48 +08:00 |
|
Morris
|
82cab7b0e3
|
Merge pull request 'fix: 后端启动稳定性修复与 macOS 编译' (#37) from fix/backend-stability-macos-build into main
Reviewed-on: #37
|
2026-11-21 01:42:11 +00:00 |
|
远影科技
|
2640de0836
|
build: macOS 发布包编译完成
PR 审核 / 后端编译 (pull_request) Waiting to run
PR 审核 / 前端检查(Flutter) (pull_request) Waiting to run
PR 审核 / 安全扫描 (pull_request) Waiting to run
|
2026-11-21 09:36:06 +08:00 |
|
Morris
|
255cfa3d85
|
Merge pull request 'feat: rewrite all models in Flutter' (#36) from feat/contour-map-rewrite into main
Reviewed-on: #36
|
2026-11-21 01:29:32 +00:00 |
|
远影科技
|
487250582c
|
feat: rewrite all models in Flutter
PR 审核 / 后端编译 (pull_request) Waiting to run
PR 审核 / 前端检查(Flutter) (pull_request) Waiting to run
PR 审核 / 安全扫描 (pull_request) Waiting to run
Replace C# Avalonia models with pure Flutter implementations:
1. Contour Map (等高线地形图)
- Five terrain types: plain, hill, mountain, plateau, basin
- Animation playback/pause controls
- Top/3D view toggle
- Hypsometric coloring
2. Earth Geography (地球地理)
- Five climate zones display
- Seven continents outlines
- Layer toggle controls
- Tropic/circle annotations
3. Earth Rotation (地球自转)
- Rotation animation
- Day/night hemispheres
- Terminator line annotation
- Axial tilt (23.5°) display
- Subsolar point tracking
4. Earth Revolution (地球公转)
- Orbital animation
- Four seasons positioning
- Subsolar point migration
- Fixed axial direction demo
5. Scale Calculator (比例尺计算器)
- Three solve modes
- Visual ruler display
- Real-time calculation
- Common scale presets
Implementation details:
- Use Flutter CustomPaint for 2D/3D rendering
- AnimationController for smooth animations
- Follow GC-UI theme and i18n system
- Implement GcModel interface for unified management
- Provide registry.dart for model registration
|
2026-11-21 09:25:34 +08:00 |
|
Morris
|
e39e6f26b1
|
Merge pull request 'fix: 修复 15 项优化与 bug' (#35) from fix/improvements into main
Reviewed-on: #35
|
2026-11-21 00:36:49 +00:00 |
|
远影科技
|
9cd4fa6266
|
fix: 修复 15 项优化与 bug
PR 审核 / 后端编译 (pull_request) Waiting to run
PR 审核 / 前端检查(Flutter) (pull_request) Waiting to run
PR 审核 / 安全扫描 (pull_request) Waiting to run
安全修复(已在 origin2/main):
- #1 DirectoryRemote/GiteaRemote/GitCodeRemote 验签失败时返回 null
- #2 LauncherUpdater 所有源失败时输出明确错误信息
- #3 源码目录删除防护已存在(GC.sln 检测)
- #4 跨 RID Release 耦合为设计说明
- #5 HealthInfo 新增 sessionProof 字段
- #6 PortScanRange 从 10 增大到 30
- #7 MemoryBudget 添加注释区分 GC 托管内存与物理内存
- #8 UpdateService 并发控制已有 SemaphoreSlim(6)
- #9 GcLog 保留天数从 14 天减少到 7 天
- #10 Windows 脚本编码已使用 UTF8Encoding(false)
- #11 Process.Start 返回值检查已添加到 SavedogLauncher
- #12 FlutterShell.IsHealthy 改为异步 IsHealthyAsync
- #13 GiteaRemote/GitCodeRemote 验签失败返回 null
- #14 DirectoryRemote 枚举与远端源保持一致,跳过 ignored 目录
- #15 Flutter 前端工作目录兜底已有 _endpointFileUrl
|
2026-11-21 08:27:07 +08:00 |
|
Morris
|
4043ed5e72
|
Merge pull request 'fix(security): 加固模型安装与本地目录源,防止同机后端伪装' (#33) from fix/security-hardening into main
Reviewed-on: #33
|
2026-11-20 23:58:13 +00:00 |
|
Morris
|
46ed84475d
|
fix(security): 加固模型安装与本地目录源,防止同机后端伪装
PR 审核 / 后端编译 (pull_request) Waiting to run
PR 审核 / 前端检查(Flutter) (pull_request) Waiting to run
PR 审核 / 安全扫描 (pull_request) Waiting to run
- ModelInstaller: 模型 Id 限定为单段安全名称,拒绝路径分隔符/绝对路径/
符号链接,源目录枚举跳过重解析点,防止写到模型库外
- DirectoryRemote: 清单验签失败如实记录;包 URL 仅允许 http(s) 公网地址,
拦截 file:/私有 IP/环回/元数据地址(SSRF);SafePath 逐级解析符号链接
并确认仍在根目录内
- 本机后端健康检查改为一次性会话令牌双向校验(/api/health 返回指纹),
同机伪造服务无法通过身份确认;所有 /api 请求需带令牌,封面图走 query
只含 7 个安全文件,基于最新 origin2/main(含已合入的 #32 课件)。
|
2026-11-21 07:43:59 +08:00 |
|
Morris
|
1dd3b40cb6
|
Merge pull request 'feat(courseware): Flutter WebView 还原等高线课件并去除授权验证' (#32) from feat/flutter-courseware into main
Reviewed-on: #32
|
2026-11-20 23:39:00 +00:00 |
|
远影科技
|
355ca89a68
|
feat(courseware): Flutter WebView 还原等高线课件并去除授权验证
PR 审核 / 后端编译 (pull_request) Waiting to run
PR 审核 / 前端检查(Flutter) (pull_request) Waiting to run
PR 审核 / 安全扫描 (pull_request) Waiting to run
- 原课件 HTML/JS/CSS/图片/视频完整搬入 Flutter assets,相对路径可直接离线运行
- 新增 CoursewarePage:本地 HttpServer + Range 支持,避免 file:// 与 CSP 限制
- 导航新增「等高线课件」,后端未就绪也可打开
- 补齐 macOS WebView 插件、Podfile、entitlements 与 Xcode 工程配置
|
2026-11-21 07:30:48 +08:00 |
|
Morris
|
4ef291568a
|
Merge pull request 'feat(contour-map): 重写为可交互 3D 等高线模型,新增五大地貌专题' (#30) from feat/contour-map-rewrite into main
Reviewed-on: #30
|
2026-11-19 12:45:58 +00:00 |
|
Morris
|
5b628971a9
|
feat(contour-map): 重写为可交互 3D 等高线模型,新增五大地貌专题
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 新增 LandformKind 与五套高度场生成器:穹状山峰、宽脊山脊、V 形山谷、双峰鞍部、台地陡崖
- 3D 视图重写:拖动旋转 / 滚轮缩放、按包围盒自动取景、法线光照、四周裙边侧壁、
切割步骤改为把高度压到切面得到真实截面并用求交线精确出线
- 四步实验动画(等高切割 → 形成交线 → 垂直投影 → 疏密判坡),俯视 / 立体切换
- 界面重排:地貌标签移到画布上方(WrapPanel,窄屏自动换行并隐藏侧栏),
右侧栏放实验流程 / 观察面板 / 判读要点;播放、重置、视图、上色、实时读数,空格与 1–5 快捷键、全屏
- 文案 90 个键中英双语;LoadTexts 改为「内置默认 + i18n 文件覆盖」,此前完全忽略语言包
- 修复三处渲染缺陷:Chain() 只向尾部延伸把等高线切成虚线;坡度归一化写死导致判坡整片红;
切割只是叠加半透明板而山尖仍在
- 清单版本 1.1 → 1.2,描述与 help.json 同步;62×62 面片 + 画刷缓存,1440×900 单帧约 35ms
|
2026-11-19 20:45:03 +08:00 |
|
Morris
|
faaee9abe2
|
Merge pull request 'fix(macos): 模型窗口改由主线程承载,修复启动模型失败与后端崩溃' (#29) from fix/model-launch-main-thread into main
Reviewed-on: #29
|
2026-11-19 12:25:32 +00:00 |
|
Morris
|
ead63e8ffe
|
fix(macos): 模型窗口改由主线程承载,修复启动模型失败与后端崩溃
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
macOS 的 AppKit 要求 NSApplication 运行在主线程。此前 AvaloniaHost 把
StartWithClassicDesktopLifetime 放到新建的后台线程,点「启动模型」即触发
进程崩溃:界面无反应、后端随之消失,部分机器表现为模型启动失败。
- AvaloniaHost 新增 RunOnCurrentThread / Shutdown:事件循环必须在主线程运行,
EnsureStartedAsync 改为只等待就绪信号,不再自行起线程。
- BackendServer.Start 增加 out AvaloniaHost 重载,把模型窗口宿主交给启动器。
- FlutterShell 在前端拉起后于主线程运行 Avalonia 事件循环,界面退出时从后台
请求关闭;无桌面会话(Avalonia 起不来)时退化为继续等待界面退出。
- 独立进程入口 Program.cs 同样把后端放后台,主线程留给 Avalonia。
|
2026-11-19 20:24:57 +08:00 |
|
Morris
|
01c2d017c6
|
Merge pull request 'fix(macos): 修复 Release 版因沙箱缺少网络权限导致无法连接后端' (#28) from fix/macos-release-sandbox-network into main
Reviewed-on: #28
|
2026-11-19 11:59:03 +00:00 |
|
Morris
|
3efdf74258
|
fix(macos): Release 版补 network 权限,修复启动后无法连接后端
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- Release.entitlements 增加 com.apple.security.network.client / network.server:
发布版启用 App Sandbox 但缺少 network.client 时,前端向 127.0.0.1 后端的
出站 HTTP 请求会被内核拒绝,表现为打开界面即提示“无法连接后端”。
- project.pbxproj 部署目标 10.14 -> 12.0,兼容 Xcode 27(最低支持 12.0)。
|
2026-11-19 19:55:46 +08:00 |
|
Morris
|
3c74effb4c
|
release: 1.1.1 发布清单与签名(Windows 双架构)
1.1.1
|
2026-11-19 18:22:05 +08:00 |
|
Morris
|
f03046bffd
|
release: 1.1.1 版本号
|
2026-11-19 18:19:35 +08:00 |
|
Morris
|
2cd18b4e5f
|
Merge pull request 'fix: 修复模型检测/自动下载与启动器更新' (#25) from fix/model-source-and-updater into main
Reviewed-on: #25
|
2026-11-19 05:48:49 +00:00 |
|
Morris
|
023e9468db
|
fix: 修复模型检测/自动下载与启动器更新
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- ModelSourceClient: 自托管 Gitea 源(git.xhmcl.com)ArchiveCandidates 之前
直接 yield break,只能靠系统 git clone。没装 git 的机器「检测模型/下载/
自动更新」全部失效。补上 archive/<branch>.zip 归档地址(已实测可用),
下载经 ResumableDownloader 完成,无需系统 git。fake-git 实测 5/5 模型可检测。
- LauncherUpdater.HashZipPayloadAsync: 只找 GC.dll/GC/GC*.dll,但产物自 1.0.10
起是 GCL-<版本>-<平台> 单文件,找不到主程序 -> sha256 无法比对 -> 不提示更新。
改为优先匹配 GCL- 主程序(排除 GC-UI/GC-SAVEDOG/.GC),兼容旧 GC 命名。
实测已从「无法比对 sha256」变为能算出远端包 sha256。
- version.json / model/version.json: 5 个模型的 manifestSha256 与仓库实际模型
json 不符(发布时 updatedAt 漂移导致),使模型自动更新每次因校验失败被丢弃
(「没有自动下载」)。按当前模型 json 实际 sha256 修正并重新签名(gc-2026-12),
两份清单保持一致;launcher 包 sha256/size 与版本号不动。
|
2026-11-19 13:17:22 +08:00 |
|
Morris
|
5e5d84856a
|
Merge pull request 'perf: 前端页面拆分 + 模型下载断点续传' (#24) from fix/build-consistency-and-tests into main
Reviewed-on: #24
|
2026-11-19 04:37:16 +00:00 |
|
Morris
|
b4724d7ca0
|
perf: 前端页面拆分 + 模型下载断点续传
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- pages.dart 按职责拆成 pages/{home,download,settings,about}.dart 四个文件,
pages.dart 保留为聚合 export,调用方 import 路径不变;flutter analyze
No issues,flutter test 8+3 项全过
- 新增 ResumableDownloader:HTTP Range 断点续传,.part 文件用 URL 哈希做
稳定命名,服务器不支持 Range 时自动退化为整段下载
- ModelSourceClient 源码 zip 下载改走断点续传,中断后重试从断点接着下
- 下载并发槽 2 -> 4(更新服务已是 6)
|
2026-11-19 06:59:06 +08:00 |
|
Morris
|
9a911089bf
|
Merge pull request 'fix: 发布一致性校验、日志轮转与构建脚本对齐' (#23) from fix/build-consistency-and-tests into main
Reviewed-on: #23
|
2026-11-18 22:46:00 +00:00 |
|
Morris
|
4bdfb49600
|
refactor(build): 末次签名去重、删死代码、zip 可复现
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
构建脚本对齐与清理(追加到发布校验 PR):
- 完整 build 只在打包末尾签一次清单(stamp_versions --no-sign +
pack_launcher 末尾 stamp_launcher_only),去掉中间冗余签名。
ECDSA 随机 nonce + signedAt 时间戳会让每次签名字节都不同,
两次签名既浪费又让中间产物反复抖动;单独 stamp/models 工具签名行为不变。
- 删除死代码 publish_backend()(后端已进程内托管,无调用者)。
- 所有 zip 命令加 -X(去掉 extra fields),让相同内容的包字节一致。
- 修复 tools.sh 的 dist 命令文件名过滤 GC-*.zip -> GCL-*.zip。
- PowerShell 版同步上述末次签名改动。
|
2026-11-19 00:19:27 +08:00 |
|
Morris
|
59a66c8fa8
|
fix: 发布一致性校验、日志轮转与构建脚本对齐
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 新增发布校验脚本(buildsh/lib/verify_release.py + release.sh),核对 tag/清单/资产
三者的 sha256 与体积,并复验清单签名;接入 ./build.sh release-verify 与
.gitea/workflows/release-verify.yml(手动触发)
- GcLog 改为常驻 StreamWriter + 按天轮转 + 14 天/64MB 保留策略,避免高峰期反复
开关文件句柄;只清理本模块生成的 gc-*.log,不碰用户文件
- 修复 Applier 验签逻辑:无效签名永远拒绝,仅「未签名」在调用方不强制时放行
- 新增应用器测试(GC.Savedog.Tests):整目录替换、.GC/bin 合并、启动失败回滚、
路径穿越防护、验签;接入 pr-check.yml
- GC.Tests 增加日志用例(写入/轮转/清理/用户文件保护)
- 同步 PowerShell 打包脚本与 buildsh 一致:GCL 命名、单顶层目录、守护进程收进
.GC/bin、启动器与守护进程压缩单文件、不预置 .GC、prune/strip 对齐、签名
keyId 改为 gc-2026-12、新增 release-verify 与应用器测试任务
|
2026-11-19 00:05:16 +08:00 |
|
xhgit
|
a5fcaeb658
|
Merge pull request '1.1.0:版本号同步,关于页补 Git 服务与感谢(itxiaohui)' (#19) from sync/1.1.0-about into main
Reviewed-on: #19
1.1.0
|
2026-11-18 15:13:00 +00:00 |
|
Morris
|
fcaacf3b33
|
1.1.0:版本号同步,关于页补 Git 服务与感谢
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- version.json / model/version.json 升到 1.1.0,写入新包 sha256 与体积并重签(gc-2026-12)
- pubspec.yaml 版本 1.0.0+1 -> 1.1.0+1,Windows 前端 exe 的版本资源跟着走
- 关于页新增「Git 服务」一行(itxiaohui)与「感谢」卡片:
地理洪老师(学科内容)、itxiaohui(Git 服务与部署),中英双语文案
- 开发者列表把早期账号 xhgit 归并到 itxiaohui,避免同一个人的两个名字
- Avalonia 回退界面同步这两处(Git 服务行 + 感谢项)
|
2026-11-18 22:51:09 +08:00 |
|
xhgit
|
0997de514e
|
Merge pull request 'release: 1.1.0 版本号' (#18) from release/1.1.0 into main
|
2026-11-18 14:33:45 +00:00 |
|
lead
|
192f2a63e9
|
1.1.0:界面重做与 DPI 修复的正式版本号
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
Directory.Build.props 的 Version 从 1.0.11 提到 1.1.0,启动器程序集版本 / 关于页 / version.json 的 launcher.version 都跟着走。
|
2026-11-18 22:33:24 +08:00 |
|
xhgit
|
a1a14f106b
|
Merge pull request 'feat(ui): 重做启动器界面并修复 DPI 发糊' (#17) from feat/ui-crisp-dpi into main
Reviewed-on: #17
|
2026-11-18 14:18:00 +00:00 |
|
lead
|
e67cc63998
|
feat(ui): 重做启动器界面并修复 DPI 发糊
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 交叉编译补嵌 runner.exe.manifest:GNUn res 不再丢掉 DPI 声明,缩放屏不再位图拉伸
- main.cpp 建窗前自行声明 Per-Monitor V2 DPI 感知(三级回退)
- win32_window 初始窗口按显示器工作区上限收缩,避免 150% 缩放后超出屏幕
- 重做主题:中性石墨底 + 高对比正文、统一字号/间距/圆角令牌、Segoe UI + 雅黑字体栈
- 首页/下载/设置/关于四页重排,宽屏自适应、小窗不溢出
- 修复下拉框字体丢失、封面遮罩盖住占位、任务状态未翻译等问题
- 截图脚本:注入 CJK/图标字体、runAsync 取像素、补小窗回归用例
|
2026-11-18 22:15:54 +08:00 |
|
Morris
|
2ba4789c95
|
Merge pull request 'macOS:守护进程收进 .app/Contents/MacOS/.GC/bin' (#16) from release/1.0.11-singlefile into main
Reviewed-on: #16
|
2026-11-18 13:50:30 +00:00 |
|
Morris
|
22baa6fda9
|
macOS 的 .GC/bin 也随包分发:守护进程不再落在 .app 根
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- pack_launcher 的 macOS 分支把包内 GC-SAVEDOG 移进 .app/Contents/MacOS/.GC/bin,
与 Windows 布局一致;.GC 位置不变,仍在启动器同级
- package_mac_app 的注释同步:包里只保留 .GC/bin,模板类目录仍由首次启动创建
- README 补 macOS 的 .GC 位置与守护进程路径
|
2026-11-18 21:10:43 +08:00 |
|
Morris
|
6ee2e8bead
|
Merge pull request '1.0.11:发布包改为单文件,非本体文件收进 .GC/bin' (#15) from release/1.0.11-singlefile into main
Reviewed-on: #15
1.0.11
|
2026-11-18 13:10:16 +00:00 |
|
Morris
|
daf218ce71
|
1.0.11:发布包改为单文件,非本体文件收进 .GC/bin
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- 启动器改成 self-contained 单文件(压缩);GC.UI.Server 抽出 BackendServer.Start,
由启动器在自己的进程内托管,发布包只剩一个 exe,不再复制两套 .NET 运行时
- 后端保留独立入口(GC.UI.Server 仍可单独 dotnet run),开发调试方式不变
- 守护进程等非本体文件统一放 .GC/bin:首次启动复制到 .GC/safedog 再运行;
更新时只合并 .GC/bin,config/model/cache/update/logs 原地不动
- 压缩包不再预置 .GC 模板,首次启动由 AppPaths.EnsureCreated + RuntimeLayout 生成
- macOS 同样打进 .app 内的单文件启动器
- 版本号 1.0.11,version.json / model/version.json 重签(gc-2026-12)
|
2026-11-18 21:08:54 +08:00 |
|
Morris
|
631a90e862
|
Linux 产物改为默认不构建(云端可显式开启)
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
- Linux 目标平台是 arm64,而官方 Flutter 引擎只有 x64 产物,x64 主机编出来的包
在 arm 机器上跑不起来
- 默认跳过并打印一行提示;GC_BUILD_LINUX=1 ./build.sh build 可显式开启
(云端 aarch64 runner 用这个开关,代码路径与打包逻辑都保留)
- 清单里的 linux-arm64 条目继续保留:没有产物就没有 sha256,下载端会跳过该平台
验证:./build.sh build 只产 GCL-1.0.10-win-{amd64,arm64}.zip,与开启前一致。
|
2026-11-18 20:41:35 +08:00 |
|
Morris
|
40af11f78a
|
Merge pull request '1.0.10:启用 GCL 命名,Linux 构建改为 arm64' (#13) from release/1.0.10-gcl into main
Reviewed-on: #13
1.0.10
|
2026-11-18 12:39:50 +00:00 |
|
Morris
|
4bcffa782d
|
1.0.10:启用 GCL 命名,Linux 构建改为 arm64
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
命名
- 发布包统一 GCL-<版本>-<平台>:zip 名、包内启动器、清单 path/name/url 同步
- 旧 GC- 包仍识别(IsLauncherPackage / VersionUtil / SAVEDOG 主程序正则),
装过 1.0.9 的机器不会把新包判成「不是启动器包」
Linux
- 构建目标由 linux-amd64 改为 linux-arm64,清单平台表同步
- Flutter Linux 引擎只有 x64 官方产物:aarch64 主机读
build/linux/arm64/release/bundle;x64 主机明确跳过并说明原因,
不产出装不上 arm 机器的 x64 包
- LabelOf 保留 linux-x64 -> linux-amd64 别名,读得懂历史产物
版本
- Directory.Build.props 1.0.9 -> 1.0.10,version.json / model/version.json 重签
验证
- ./build.sh build:GCL-1.0.10-win-amd64.zip 71MB、GCL-1.0.10-win-arm64.zip 69MB,
均为单顶层目录 + 包内 safedog/ + Flutter 前端
- GC.Tests --update-test 全部通过
|
2026-11-18 20:38:29 +08:00 |
|
Morris
|
097bfd198e
|
Merge pull request '发布包改为 GCL 单目录布局,.GC 增加 safedog 与中英双语日志' (#11) from feat/gcl-package-layout into main
Reviewed-on: #11
|
2026-11-18 12:27:27 +00:00 |
|
Morris
|
31b0c93b25
|
发布包改为 GCL 单目录布局,.GC 增加 safedog 与中英双语日志
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
包结构
- 压缩包内只有一个顶层目录 GCL-<版本>-<平台>/,解压后不再散落一屏 dll
- 启动器改名为 GCL-<版本>-<平台>(.exe),Flutter 前端与后端仍在同一目录
- 守护进程移入包内 safedog/,运行时复制到 .GC/safedog
运行目录
- .GC 新增 safedog/:实际运行守护进程,整目录替换永远不会覆盖正在运行的它
- .GC 新增 logs/:按天写 gc-YYYYMMDD.log(中文)与 gc-YYYYMMDD.en.log(英文)
- 启动器、后端、SAVEDOG 共用同一组日志文件,整条启动/更新链路可一起排查
更新链路
- 包名/目录统一 GCL- 前缀,同时兼容旧 GC- 包(可从旧版本升级)
- 更新包解压后展平单顶层目录,仍按整目录替换安装
- Linux 无扩展名启动器仍可识别,兼容脚本清理旧版时覆盖 GCL-*
验证
- ./build.sh build 通过,产物 GCL-1.0.9-{win-amd64,win-arm64,linux-amd64}.zip
- 实跑 Linux 包:.GC/safedog/GC-SAVEDOG 与 .GC/logs/gc-20261118[.en].log 均生成
- GC.Tests --update-test 全部通过
|
2026-11-18 20:27:06 +08:00 |
|
Morris
|
39dc23cb57
|
Merge pull request '修复审计问题:整目录更新、主题与轮询、移除 nightly' (#10) from fix/audit-cleanup into main
Reviewed-on: #10
|
2026-11-18 12:18:10 +00:00 |
|
Morris
|
a361c889f8
|
修复审计发现的问题,默认构建即带 Flutter 前端
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
P0
- GC-SAVEDOG:更新改为整目录替换(旧文件备份到 .GC/update/backup,
失败可完整回滚),不再只搬一个 exe;回滚会删掉新包独有文件
- GC-SAVEDOG:包名校验放宽为单文件名模式,Linux 启动器(无扩展名)可更新
- GC-DOWNLOAD:测速全失败时不再回退 GitCode,改为返回「不可用」并保留上次可用源
- GC-DOWNLOAD:识别并赋予 Linux 无扩展名启动器可执行位;兼容脚本清理旧版时
也覆盖无扩展名产物
- CI:删除 nightly-prerelease(绕开 build.sh,产出无前端空壳);alpha 工作流
去掉非法 cron,只保留手动触发
P1
- 前端:主题设置真正生效(深色/浅色/跟随系统 + 持久化),去掉死字段
- 前端:下载页轮询改为自适应单次链,页面不可见或任务结束后降频/停止
- 前端:下载完成 / 删除模型后首页列表自动刷新
- 前端:复用 http.Client,不再每次轮询新建连接
- 后端:/api/models 走缓存,不再每次全盘递归统计体积
- 设置页:外部改动能同步进表单,不再只同步一次
P2
- 错误响应统一为 ErrorDto,不再复用 LaunchResultDto
- 限流桶定期清理,避免无限增长
- 播放器窗口去重,避免同一模型重复开窗
- 封面按实际格式返回,去掉错误的 image/png 与 no-store
- 端口集中到 GcUiContract,前端可用 GC_UI_PORT 或 ui-backend.json 发现后端
- 构建:Windows 包改为散开发布,与后端共用运行时(体积约 109MB -> 72MB)
- 文档:更新仓库地址与更新流程说明
测试:dotnet build 全绿;GC.Tests 更新链路全通过;flutter analyze 无问题;
flutter test 11 项全通过。
|
2026-11-18 20:10:03 +08:00 |
|
Morris
|
461e79aa7f
|
Merge pull request 'build: 默认编 Flutter 前端,补 Linux 目标并按主机选择产物' (#9) from feat/flutter-default into main
Reviewed-on: #9
|
2026-11-18 11:23:16 +00:00 |
|
Morris
|
d7f6d8de9f
|
build: 默认编 Flutter 前端,补 Linux 目标并按主机选择产物
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
此前 build.sh 在非 Windows 宿主上把前端当「可选项」:flutter 缺失只告警、
交叉编译失败只告警、macOS 前端在 Linux 上直接跳过。结果是包照出,用户拿到
的是 Avalonia 回退界面,而构建日志里一行红字很容易被忽略。
改为默认必需:
- build_flutter_ui / build_flutter_ui_cross 缺 flutter 或编译失败一律返回非 0,
build.sh 立即中断并给出原因(交叉编译失败时带日志尾巴)
- 确实要出降级包时显式声明 ./build.sh build --allow-no-ui
目标平台按构建主机决定,每条产物都带 Flutter:
macOS 主机 → mac-arm64(Xcode 原生)+ win-amd64/win-arm64(mingw 交叉)
Linux 主机 → linux-amd64(原生)+ win-amd64/win-arm64(mingw 交叉)
Windows 主机 → win-amd64/win-arm64(原生)
Linux 目标此前根本不存在,这次一并补上:
- GC-UI/frontend/linux/ 由 flutter create 生成,BINARY_NAME=GC-UI、
APPLICATION_ID=com.xhmcl.GC、窗口标题 "Morris GC"
- build_flutter_ui 增加 linux 分支,bundle(GC-UI + lib/ + data/)铺进
dist/linux-amd64/,pack_launcher 增加 Linux 整目录打包
- linux/CMakeLists.txt 强制 CMAKE_INSTALL_PREFIX 指向 build/.../bundle:
某些环境下它会被初始化成 /usr/local,导致 flutter 报「构建成功」但
bundle 是空的、产物装进了系统目录(本机实测踩到)
顺带修正两处:
- 生成 settings.json 的默认 updateRepository 还是 gitcode 地址,与只保留
xhmcl 源的现状不符
- 进度条权重改为按实际目标动态计算,新平台不会再把总进度算过 100%
验证(Linux 主机,flutter 3.24.5):
- ./build.sh build 出 win-amd64 109 MB、win-arm64 105 MB、linux-amd64 65 MB,
三份均含 Flutter 前端,清单签名 Verified
- Linux 包在 Xvfb + llvmpipe 下实跑:后端 /api/health 返回 ok,GC-UI 窗口
正常渲染出模型库首页
- macOS 目标在 Linux 上不再产出 Avalonia 空壳包(要它得回 macOS 编)
|
2026-11-18 19:15:05 +08:00 |
|
Morris
|
7e34cb0467
|
Merge pull request 'fix(update): 换发清单签名密钥,补齐 1.0.9 已签名清单' (#8) from feat/manifest-signing into main
Reviewed-on: #8
1.0.9
|
2026-11-18 10:41:20 +00:00 |
|
Morris
|
e327a56421
|
fix(update): 换发清单签名密钥,补齐 1.0.9 已签名清单
PR 审核 / 后端编译 (pull_request) Canceled after 0s
PR 审核 / 后端自检 (pull_request) Canceled after 0s
PR 审核 / 前端检查(Flutter) (pull_request) Canceled after 0s
PR 审核 / 安全扫描 (pull_request) Canceled after 0s
PR 审核 / 审核汇总 (pull_request) Canceled after 0s
仓库里硬编码的公钥 gc-2026-11 没有对应的私钥(.signing/ 在 .gitignore 里,
私钥从来没入过库,也无法找回),导致 build.sh 每次签名都失败,version.json
始终是「未签名」。而客户端默认 RequireSignedManifest=true,未签名清单一律
拒绝更新 —— 自动更新实际上完全不可用。
改动:
- keygen 生成新密钥 gc-2026-12(指纹 ee6083be47a87907),公钥写进
SignatureKeyring;旧 gc-2026-11 保留一个版本周期,标注为「私钥遗失、已停用」
- GC-SAVEDOG 的 DefaultKeyId 与 build_funcs.sh 的 GC_SIGNING_KEY_ID 默认值
同步改为 gc-2026-12,避免 keyId 与私钥不匹配又签出 Invalid
- GC.Tests 构造可信清单时用的 keyId 改为 gc-2026-12(原来硬编码旧 keyId,
换钥匙后会判成 Invalid)
- README 补上密钥轮换的实际步骤与「换钥匙老客户端就更新不了」的代价
- Directory.Build.props 版本 1.0.7 → 1.0.9(此前只靠 -version 传参,
仓库里一直停在 1.0.7,与实际发布脱节)
- version.json / model/version.json 换成 1.0.9 且带 gc-2026-12 签名,
两份字节一致
验证:
- GC.Tests --update-test 全通过,日志里是「清单验签通过(gc-2026-12)」,
篡改清单被判 Invalid 并拒绝更新
- GC-SAVEDOG verify --manifest version.json → Verified
- 三平台重新出包:win-amd64 109 MB、win-arm64 105 MB、mac-arm64 57 MB
注意:1.0.8 及更早的客户端只认识旧公钥,这份清单在它们眼里是「签名无效」,
与之前的「未签名」等价 —— 都不会自动更新。要让自动更新真正生效,需要把
带新公钥的 1.0.9 发出去。
|
2026-11-18 18:20:32 +08:00 |
|