mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
按发布纪律回流。**注意这是内容对齐而非 merge**,理由与依据:
1. 纪律禁止 merge 回主干,因为 merge 会把发布分支的**版本号变更**带进 main。
本项目版本号**只由 `git describe --tags` 推导**(Makefile VERSION),
仓库里没有任何文件存放版本号 ⇒ 回流不存在版本污染风险。
2. 逐项核对确认 **main 是 release 的内容严格子集**:
- `main` 独有的**文件**:0 个;
- `internal/lua/plugins.go` / `internal/core/kernel_actions.go` 等内核文件
main 独有行数:0;
- `deploy.sh` 那 14 行只是 emoji 清理(release 刻意去掉了 emoji);
- `channels.lua` 那 333 行是**旧版内容**(旧 exports 表、旧模型名单)。
- main 独有的 9 个提交按 patch-id **全部已在 release 中等效存在**
(`git cherry` 逐条列出均为 `-`,即已合入)。
3. 故回流 = 把 release 的内容带到 main,等价于"只捡拾修复、不带版本号",
且不会丢任何 main 独有的修复。
本次带回 v2.0.12 的全部内容(37 个提交):
- 源串行 + 按模型节流(照 model-gate)
- 已失效模型存储 + 远端目录闸门
- 余额分档选号
- 模型能力元数据(models.dev,isFree 权威判定)
- **凭据续期修复**(此前恒报 ok:true 却一个请求都不发)
- 通用件 TTL 缓存 + 串行锁;account_test/account_adopt/account_delete 修正
- 内核级:出站授权持久化重启后不生效、`__llmsproxy_plugin_dir` ground truth
校验:`git diff release/v2.0.x` = 0 行;`go build -tags luajit ./...` 通过。
45 lines
1.3 KiB
JSON
45 lines
1.3 KiB
JSON
[
|
|
{
|
|
"u": "12345",
|
|
"devid": "707304999019651",
|
|
"market": "5daa819c-8425-4bae-88b7-2bbfec3c25ba",
|
|
"sess": "e5b8dfc5830ce0bdb141f7177effb90a7cf8227bb23b930a427a8550bf7357df"
|
|
},
|
|
{
|
|
"u": "UID-abc",
|
|
"devid": "579362202930608",
|
|
"market": "a5388fc1-5969-4666-bc74-be9a11f69567",
|
|
"sess": "a47da2e13fe16d49dc859fbed58d1d99e0faef5d116acafc64a2d26013d17a1f"
|
|
},
|
|
{
|
|
"u": "900000001",
|
|
"devid": "764948639142479",
|
|
"market": "e449daa5-b0c0-4f35-918e-8bb01b33f179",
|
|
"sess": "fdd37c37d1cc950439c25467e6dca75fcc84a2b0d294aa910387a9a965645650"
|
|
},
|
|
{
|
|
"u": "x",
|
|
"devid": "268405722745284",
|
|
"market": "4f2427c5-0583-4f82-8e18-4e38566dd857",
|
|
"sess": "79be40fff0fbaee572d1ba3ab13a47af9d2f4d943115ef512c56e42132e23a66"
|
|
},
|
|
{
|
|
"u": "",
|
|
"devid": "170789623621479",
|
|
"market": "b32897c1-f9c0-4ad2-b2b4-725455fffb6b",
|
|
"sess": "4a61a6b4c4bcbf1040bf0edf3df2b3e7d76a956f3ef81ef8f148eadcc03d25cc"
|
|
},
|
|
{
|
|
"u": "用户1",
|
|
"devid": "263026789643405",
|
|
"market": "1c1b4e1f-9d7a-4698-9f34-b057d9a74b0b",
|
|
"sess": "a13dbde68977eee49818e2e2fb7d3bbb1ffb4c807a6e6f1831168a84adea0dfe"
|
|
},
|
|
{
|
|
"u": "1234567890123456789012345",
|
|
"devid": "358669731114854",
|
|
"market": "449882ec-9a69-4a7a-b9ab-25aa59b28c50",
|
|
"sess": "305eb96fe14a194386c0fd4148d4919870ed803b69cf75296b53ea1f41e4c574"
|
|
}
|
|
]
|