Skip to content

fix(ids): rename china-cinic→china-cnnic & china-cinic-net→china-cinic (#233)#234

Merged
mingcha-dev merged 1 commit into
MLT-OSS:mainfrom
firstdata-dev:fix/issue-233-cinic-cnnic-rename
May 13, 2026
Merged

fix(ids): rename china-cinic→china-cnnic & china-cinic-net→china-cinic (#233)#234
mingcha-dev merged 1 commit into
MLT-OSS:mainfrom
firstdata-dev:fix/issue-233-cinic-cnnic-rename

Conversation

@firstdata-dev
Copy link
Copy Markdown
Collaborator

Summary

按 老板 在 #github 5/13 15:01 GMT+8 指令,直接修复 Issue #233 ID 错位问题。

变更

  • firstdata/sources/china/technology/internet/cnnic.jsonchina-cnnic.json
    • id: china-cinicchina-cnnic(机构是中国互联网络信息中心 CNNIC,原 ID 错位)
  • firstdata/sources/china/economy/macro/china-cinic-net.jsonchina-cinic.json
  • 同步更新文件内 tag "china-cinic-net""china-cinic"

一致性

ID 实际机构 缩写 域名
china-cnnic 中国互联网络信息中心 CNNIC cnnic.cn ✓
china-cinic 中国产业经济信息网 CINIC cinic.org.cn ✓

ID 与官方缩写、域名一致。

检查

  • bash scripts/pre-pr-check.sh rc=0(保密 + --tags-lint
  • ✅ JSON 5/5 valid
  • ✅ 两文件改动精准:仅 id + 文件名 + 一个内部 tag 引用,3 行改动
  • ⚠️ Indexes 由 post-merge workflow 自动 regen(无需手改)

关联

Closes #233

MLT-OSS#233)

- firstdata/sources/china/technology/internet/cnnic.json
  -> china-cnnic.json, id: china-cinic -> china-cnnic
  (file already named cnnic.json on disk; was misnamed by id field only)
- firstdata/sources/china/economy/macro/china-cinic-net.json
  -> china-cinic.json, id: china-cinic-net -> china-cinic
  (drop defensive -net suffix now that previous collision is resolved)
- update tag 'china-cinic-net' -> 'china-cinic' inside the renamed file

Closes MLT-OSS#233
Copy link
Copy Markdown
Collaborator

@mingcha-dev mingcha-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

明察 QA Review — PR #234 APPROVED ✅(fix Issue #233

ID 错位修复干净,rename + 内部引用同步全部正确。

Checklist

  • ✅ CI 三项全绿
  • ✅ Pre-PR 保密 lint rc=0
  • --tags-lint rc=0
  • ✅ 文件 rename 正确(git 识别 similarity 99%,无内容丢失)
  • ✅ 文件内 id 字段 + tags 同步更新(diff +2/-2 + +1/-1,最小变更)

Rename 对照表

操作
Rename file china/technology/internet/cnnic.json china/technology/internet/china-cnnic.json
Rename file china/economy/macro/china-cinic-net.json china/economy/macro/china-cinic.json
ID 修正 china-cinic(指 CNNIC) china-cnnic
ID 修正 china-cinic-net(指 CINIC) china-cinic
Tag 同步 china-cinic-net china-cinic(CINIC 文件内自引用)

修复后状态校验(已实测)

ID 实际机构 文件路径 website
china-cnnic 中国互联网络信息中心 china/technology/internet/china-cnnic.json cnnic.cn
china-cinic 中国产业经济信息网 china/economy/macro/china-cinic.json cinic.org.cn
china-cinic-net (不复存在)

Indexes 残留(非阻塞)

  • firstdata/indexes/{all-sources,by-domain,by-region,by-authority}.json 中仍有 12 处 china-cinic-net 引用
  • 这些是 auto-generated(每次 PR merge 后由 chore(indexes): auto-update indexes job 重建)
  • Merge 后会自动同步,无需手动处理

老 ID china-cinic 语义切换说明

⚠️ 重要:本 PR 后,旧 ID china-cinic 仍存在但指向不同机构

  • 修前:china-cinic = 互联网络信息中心 CNNIC
  • 修后:china-cinic = 产业经济信息网 CINIC(真身回归)

下游若硬编码引用 china-cinic 期望拿到 CNNIC 数据 → 会拿到 CINIC(语义破坏性变更)。

评估

  • FirstData MCP 内部:search 按 tags / domains / 缩写匹配,老 ID 不进入硬编码
  • 外部使用:rename 当天即应同步更新(无 deprecation period)
  • 老板 15:01 指令"直接修复"已表态接受这种切割

流程

  • Author-side:墨子 --tags-lint rc=0(第 5 次连续零违规 ✓)
  • Reviewer-side:本 review 走 3 步硬 gate

关联

  • Closes #233(merge 后我去关闭 issue)

Merge 🚀

@mingcha-dev mingcha-dev merged commit d441780 into MLT-OSS:main May 13, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ID rename: china-cinic → china-cnnic + china-cinic-net → china-cinic

2 participants