Compare commits
283 Commits
cd807e58e3
...
hotfix/wal
| Author | SHA1 | Date | |
|---|---|---|---|
| 07e55d9f38 | |||
| 2885b503b3 | |||
| 062f5a436f | |||
| ba435dd6a6 | |||
| 3f21f7a7d6 | |||
| 5f960daf78 | |||
| 3b7b856e48 | |||
| cf36f1447f | |||
|
|
1f634eb465 | ||
|
|
84ab3bad99 | ||
|
|
6c8594633a | ||
|
|
064961471b | ||
|
|
e37aad9e1d | ||
|
|
7ec84fbc0f | ||
|
|
2f0b24ce88 | ||
|
|
e56649e5be | ||
|
|
1c492fe8db | ||
|
|
e139f5e227 | ||
|
|
016e7bee79 | ||
|
|
c437593a8c | ||
|
|
134021c91e | ||
|
|
5c779cb6e0 | ||
|
|
32c9859b38 | ||
|
|
283e3e3eb3 | ||
|
|
6a70713b30 | ||
|
|
4ccbf13197 | ||
|
|
0ae8148689 | ||
|
|
9a802c04e5 | ||
|
|
4d419a1966 | ||
|
|
fe2041bcf5 | ||
|
|
6ac19d6565 | ||
|
|
cce27975a1 | ||
|
|
d86ac46761 | ||
|
|
420f3d83f9 | ||
|
|
27fba9160c | ||
|
|
5089a71764 | ||
|
|
5f57429fb0 | ||
|
|
46ede81aef | ||
|
|
36e68e6672 | ||
|
|
a6cd550b94 | ||
|
|
c6e65fde9b | ||
|
|
1b47fb8f32 | ||
|
|
c5126c583b | ||
|
|
918b9b4f25 | ||
|
|
944526d9ef | ||
|
|
6c8352491c | ||
|
|
1ee554daec | ||
|
|
34a7cf0f3c | ||
|
|
6a3fffc46c | ||
|
|
872769e69e | ||
|
|
1550ef3cb1 | ||
|
|
58863e8ec5 | ||
|
|
0d96a94e5f | ||
|
|
cf689beceb | ||
|
|
f4d92f99a2 | ||
|
|
e131d6ba77 | ||
|
|
bcbc290bad | ||
| 4c1e4f428a | |||
| 20b5d70af9 | |||
| 226474b434 | |||
| 860f589b9a | |||
| 2adbc87a52 | |||
| 6e564d1d1a | |||
| 3d28e29eaa | |||
| 0948494b1c | |||
| 599289a94e | |||
| b988f99a95 | |||
| 56adc30409 | |||
| 53e95751b1 | |||
| 58bdb2f18e | |||
| a03ba5d396 | |||
| 2768deb0b6 | |||
| e2301d5f3b | |||
| 9f5c5c3680 | |||
| 5e7e68cce7 | |||
| ca939ff617 | |||
| 8de9c59b1c | |||
| 631c5392b6 | |||
| af5a21ed1e | |||
| 480d4c4583 | |||
| ed071918ed | |||
| d597a25c69 | |||
| 81aa3c2b11 | |||
| a5388446d3 | |||
| 8f3a68a673 | |||
| 95fc0b0a1b | |||
| b7369a9c71 | |||
| 05a5694a5f | |||
| 1350a9ed79 | |||
| 93200a9074 | |||
| 02d522564f | |||
| b6d21b81e3 | |||
| 98ff88d5c3 | |||
| a9eaf1d697 | |||
| 97851c2595 | |||
| ebaf112c80 | |||
| 09cf0be86e | |||
| 6a6672d0e4 | |||
| 0b86720534 | |||
| a93acc0784 | |||
| 7c85a8cf29 | |||
| 348cb4e670 | |||
| e77bb0d09b | |||
| 73a3a04204 | |||
| 573e887ca5 | |||
| 29d3d48dbe | |||
| d42fe2b0ca | |||
| eb74dd7849 | |||
| 3a2e3f2571 | |||
| b0bd37ec12 | |||
| 001f8caf35 | |||
| 21b73a750d | |||
| ee7bfb81f0 | |||
| b4a9e0c1c9 | |||
| 948243b13d | |||
| 5425e2ce19 | |||
| 70fb7dadef | |||
| 8a3c45c577 | |||
| 9238eeb56e | |||
| 9674e0d0d9 | |||
| 248ed55f4e | |||
| 66e12e9629 | |||
| 4f4e42f27e | |||
| 6b3b33b2f0 | |||
| 74c7b27327 | |||
| 37b4483183 | |||
| 516a7f5bdf | |||
| fe4c545308 | |||
| bb33232b1b | |||
| c3ae7fcfbc | |||
| 66cec7515a | |||
| cb75b5668b | |||
| 95104100c9 | |||
| 02ccf57aa3 | |||
| 60debb7505 | |||
| 531de3c760 | |||
| a887f91686 | |||
| 7efcea2b54 | |||
| 85bef83752 | |||
| bc344f892c | |||
| 41db5b56af | |||
| 15cd26c81a | |||
| 3f2cf31543 | |||
| ba73913a41 | |||
| a44c88005d | |||
| f177c26016 | |||
| 4bde09837a | |||
| c250a47651 | |||
| a7f2c4480a | |||
| 37e113bbf4 | |||
| 5442dcbeda | |||
| b9fc828567 | |||
| 327c72ca74 | |||
| 32f03cd2c1 | |||
| 8d2e8faa84 | |||
| 1f1f31a7cb | |||
| 52d883d8a0 | |||
| 6b1fbf4a92 | |||
| 10a35625a5 | |||
| a207c51bfb | |||
| 6eb6d381f7 | |||
| e27758cce3 | |||
| 7137ed087f | |||
| a9690a49db | |||
| 0f58886454 | |||
| 9f8173e124 | |||
| 1d930cc82d | |||
| 1b21d4dafa | |||
| e573a82120 | |||
| e049080f6c | |||
| 9942bbc74e | |||
| fc9f819787 | |||
| 33a4d25ca9 | |||
| e9862a67ba | |||
| 868f5a8ef3 | |||
| fd795d8742 | |||
| 2b3a9cb33f | |||
| 4b8784d5e7 | |||
| 2413c2fe14 | |||
| e52671eaed | |||
| 716e9f5971 | |||
| 28ac58ea18 | |||
| 8e61cb1a54 | |||
| 4aab0bcbf2 | |||
| 6caf0f6141 | |||
| 6e15e1b853 | |||
| ad30f5d41b | |||
| b538e45bd9 | |||
| 1033d7666b | |||
| 0d2baabcf1 | |||
| 9d8e3926ff | |||
| c5ed040359 | |||
| 363e0efb34 | |||
| 1363797378 | |||
| 71498883b5 | |||
| 1d75a4c31a | |||
| 89eec1406a | |||
| 9a625f51ef | |||
| 2d6456c4a3 | |||
| 9bd1d60e85 | |||
| 908c5fa1de | |||
| 505b30aa8f | |||
| e0a37f4a11 | |||
| 4c284c422c | |||
| 44e4f03957 | |||
| 0a2961ecd6 | |||
| fa554c3930 | |||
| 1125701329 | |||
| ed1facc1b8 | |||
| 0cba6fd6d5 | |||
| 94f20ce8c7 | |||
| aef20d2ab1 | |||
| 0ec16d4afa | |||
| 7e4c61e6e9 | |||
| 2d0b4e9bc0 | |||
| 520b126ecf | |||
| 5d9be1d7e4 | |||
| 5065d925ad | |||
| 97d6319b64 | |||
| 0a27a78d97 | |||
| fc995187df | |||
| 8bf1282378 | |||
| 854330a4b4 | |||
| e40ad462e1 | |||
| 647d78309d | |||
| c7f486ae09 | |||
| 71559547b6 | |||
| 6292443f69 | |||
| 97c196b7c6 | |||
| cb328f3ec2 | |||
| 9992e82a3c | |||
| e2003eb9e3 | |||
| 71048e31d4 | |||
| 4a1e44f9e1 | |||
| dd408fcdca | |||
| 516bb92a16 | |||
| 023a4309eb | |||
| b972a776d9 | |||
| d26010b29d | |||
| 8706247436 | |||
| 8154a61453 | |||
| d9de704d73 | |||
| 4ea4a1e53f | |||
| 041856dc8c | |||
| 7cdb66cbe4 | |||
| 5410181e77 | |||
| 548ec0cd6b | |||
| 5e9e41db21 | |||
| c35542f911 | |||
| 42c5ec912f | |||
| c0b64c9e30 | |||
| 37706bc7ce | |||
| 7308afe801 | |||
| c1456f3c54 | |||
| 640ea8ec99 | |||
| 8569873690 | |||
| 5196472d7e | |||
| 814a2956b3 | |||
| 4879d9bf07 | |||
| 8d8d426e2e | |||
| 246ae5e123 | |||
| 7e613a0d2b | |||
| 510a5bfb21 | |||
| decb7a10ec | |||
| 5588c7c762 | |||
| eebc7194d8 | |||
| e945a672ed | |||
| 41d3667df2 | |||
| 8f66ca7bcb | |||
| e9ff14df0e | |||
| c807b99a91 | |||
| 677d6239ce | |||
| d0989c66bb | |||
| 67f3286e09 | |||
| a8b52f8ae1 | |||
| 5496cb58aa | |||
| 3cb16804a4 | |||
| 2a7ac3f86e | |||
| ef8ec025bd | |||
| 23e12d8a73 | |||
| 4a18aac6ce | |||
| 51fa027eb8 | |||
| afc6d7fc76 |
49
.agents/skills/caveman/SKILL.md
Normal file
49
.agents/skills/caveman/SKILL.md
Normal file
@@ -0,0 +1,49 @@
|
||||
---
|
||||
name: caveman
|
||||
description: >
|
||||
Ultra-compressed communication mode. Cuts token usage ~75% by dropping
|
||||
filler, articles, and pleasantries while keeping full technical accuracy.
|
||||
Use when user says "caveman mode", "talk like caveman", "use caveman",
|
||||
"less tokens", "be brief", or invokes /caveman.
|
||||
---
|
||||
|
||||
Respond terse like smart caveman. All technical substance stay. Only fluff die.
|
||||
|
||||
## Persistence
|
||||
|
||||
ACTIVE EVERY RESPONSE once triggered. No revert after many turns. No filler drift. Still active if unsure. Off only when user says "stop caveman" or "normal mode".
|
||||
|
||||
## Rules
|
||||
|
||||
Drop: articles (a/an/the), filler (just/really/basically/actually/simply), pleasantries (sure/certainly/of course/happy to), hedging. Fragments OK. Short synonyms (big not extensive, fix not "implement a solution for"). Abbreviate common terms (DB/auth/config/req/res/fn/impl). Strip conjunctions. Use arrows for causality (X -> Y). One word when one word enough.
|
||||
|
||||
Technical terms stay exact. Code blocks unchanged. Errors quoted exact.
|
||||
|
||||
Pattern: `[thing] [action] [reason]. [next step].`
|
||||
|
||||
Not: "Sure! I'd be happy to help you with that. The issue you're experiencing is likely caused by..."
|
||||
Yes: "Bug in auth middleware. Token expiry check use `<` not `<=`. Fix:"
|
||||
|
||||
### Examples
|
||||
|
||||
**"Why React component re-render?"**
|
||||
|
||||
> Inline obj prop -> new ref -> re-render. `useMemo`.
|
||||
|
||||
**"Explain database connection pooling."**
|
||||
|
||||
> Pool = reuse DB conn. Skip handshake -> fast under load.
|
||||
|
||||
## Auto-Clarity Exception
|
||||
|
||||
Drop caveman temporarily for: security warnings, irreversible action confirmations, multi-step sequences where fragment order risks misread, user asks to clarify or repeats question. Resume caveman after clear part done.
|
||||
|
||||
Example -- destructive op:
|
||||
|
||||
> **Warning:** This will permanently delete all rows in the `users` table and cannot be undone.
|
||||
>
|
||||
> ```sql
|
||||
> DROP TABLE users;
|
||||
> ```
|
||||
>
|
||||
> Caveman resume. Verify backup exist first.
|
||||
117
.agents/skills/diagnose/SKILL.md
Normal file
117
.agents/skills/diagnose/SKILL.md
Normal file
@@ -0,0 +1,117 @@
|
||||
---
|
||||
name: diagnose
|
||||
description: Disciplined diagnosis loop for hard bugs and performance regressions. Reproduce → minimise → hypothesise → instrument → fix → regression-test. Use when user says "diagnose this" / "debug this", reports a bug, says something is broken/throwing/failing, or describes a performance regression.
|
||||
---
|
||||
|
||||
# Diagnose
|
||||
|
||||
A discipline for hard bugs. Skip phases only when explicitly justified.
|
||||
|
||||
When exploring the codebase, use the project's domain glossary to get a clear mental model of the relevant modules, and check ADRs in the area you're touching.
|
||||
|
||||
## Phase 1 — Build a feedback loop
|
||||
|
||||
**This is the skill.** Everything else is mechanical. If you have a fast, deterministic, agent-runnable pass/fail signal for the bug, you will find the cause — bisection, hypothesis-testing, and instrumentation all just consume that signal. If you don't have one, no amount of staring at code will save you.
|
||||
|
||||
Spend disproportionate effort here. **Be aggressive. Be creative. Refuse to give up.**
|
||||
|
||||
### Ways to construct one — try them in roughly this order
|
||||
|
||||
1. **Failing test** at whatever seam reaches the bug — unit, integration, e2e.
|
||||
2. **Curl / HTTP script** against a running dev server.
|
||||
3. **CLI invocation** with a fixture input, diffing stdout against a known-good snapshot.
|
||||
4. **Headless browser script** (Playwright / Puppeteer) — drives the UI, asserts on DOM/console/network.
|
||||
5. **Replay a captured trace.** Save a real network request / payload / event log to disk; replay it through the code path in isolation.
|
||||
6. **Throwaway harness.** Spin up a minimal subset of the system (one service, mocked deps) that exercises the bug code path with a single function call.
|
||||
7. **Property / fuzz loop.** If the bug is "sometimes wrong output", run 1000 random inputs and look for the failure mode.
|
||||
8. **Bisection harness.** If the bug appeared between two known states (commit, dataset, version), automate "boot at state X, check, repeat" so you can `git bisect run` it.
|
||||
9. **Differential loop.** Run the same input through old-version vs new-version (or two configs) and diff outputs.
|
||||
10. **HITL bash script.** Last resort. If a human must click, drive _them_ with `scripts/hitl-loop.template.sh` so the loop is still structured. Captured output feeds back to you.
|
||||
|
||||
Build the right feedback loop, and the bug is 90% fixed.
|
||||
|
||||
### Iterate on the loop itself
|
||||
|
||||
Treat the loop as a product. Once you have _a_ loop, ask:
|
||||
|
||||
- Can I make it faster? (Cache setup, skip unrelated init, narrow the test scope.)
|
||||
- Can I make the signal sharper? (Assert on the specific symptom, not "didn't crash".)
|
||||
- Can I make it more deterministic? (Pin time, seed RNG, isolate filesystem, freeze network.)
|
||||
|
||||
A 30-second flaky loop is barely better than no loop. A 2-second deterministic loop is a debugging superpower.
|
||||
|
||||
### Non-deterministic bugs
|
||||
|
||||
The goal is not a clean repro but a **higher reproduction rate**. Loop the trigger 100×, parallelise, add stress, narrow timing windows, inject sleeps. A 50%-flake bug is debuggable; 1% is not — keep raising the rate until it's debuggable.
|
||||
|
||||
### When you genuinely cannot build a loop
|
||||
|
||||
Stop and say so explicitly. List what you tried. Ask the user for: (a) access to whatever environment reproduces it, (b) a captured artifact (HAR file, log dump, core dump, screen recording with timestamps), or (c) permission to add temporary production instrumentation. Do **not** proceed to hypothesise without a loop.
|
||||
|
||||
Do not proceed to Phase 2 until you have a loop you believe in.
|
||||
|
||||
## Phase 2 — Reproduce
|
||||
|
||||
Run the loop. Watch the bug appear.
|
||||
|
||||
Confirm:
|
||||
|
||||
- [ ] The loop produces the failure mode the **user** described — not a different failure that happens to be nearby. Wrong bug = wrong fix.
|
||||
- [ ] The failure is reproducible across multiple runs (or, for non-deterministic bugs, reproducible at a high enough rate to debug against).
|
||||
- [ ] You have captured the exact symptom (error message, wrong output, slow timing) so later phases can verify the fix actually addresses it.
|
||||
|
||||
Do not proceed until you reproduce the bug.
|
||||
|
||||
## Phase 3 — Hypothesise
|
||||
|
||||
Generate **3–5 ranked hypotheses** before testing any of them. Single-hypothesis generation anchors on the first plausible idea.
|
||||
|
||||
Each hypothesis must be **falsifiable**: state the prediction it makes.
|
||||
|
||||
> Format: "If <X> is the cause, then <changing Y> will make the bug disappear / <changing Z> will make it worse."
|
||||
|
||||
If you cannot state the prediction, the hypothesis is a vibe — discard or sharpen it.
|
||||
|
||||
**Show the ranked list to the user before testing.** They often have domain knowledge that re-ranks instantly ("we just deployed a change to #3"), or know hypotheses they've already ruled out. Cheap checkpoint, big time saver. Don't block on it — proceed with your ranking if the user is AFK.
|
||||
|
||||
## Phase 4 — Instrument
|
||||
|
||||
Each probe must map to a specific prediction from Phase 3. **Change one variable at a time.**
|
||||
|
||||
Tool preference:
|
||||
|
||||
1. **Debugger / REPL inspection** if the env supports it. One breakpoint beats ten logs.
|
||||
2. **Targeted logs** at the boundaries that distinguish hypotheses.
|
||||
3. Never "log everything and grep".
|
||||
|
||||
**Tag every debug log** with a unique prefix, e.g. `[DEBUG-a4f2]`. Cleanup at the end becomes a single grep. Untagged logs survive; tagged logs die.
|
||||
|
||||
**Perf branch.** For performance regressions, logs are usually wrong. Instead: establish a baseline measurement (timing harness, `performance.now()`, profiler, query plan), then bisect. Measure first, fix second.
|
||||
|
||||
## Phase 5 — Fix + regression test
|
||||
|
||||
Write the regression test **before the fix** — but only if there is a **correct seam** for it.
|
||||
|
||||
A correct seam is one where the test exercises the **real bug pattern** as it occurs at the call site. If the only available seam is too shallow (single-caller test when the bug needs multiple callers, unit test that can't replicate the chain that triggered the bug), a regression test there gives false confidence.
|
||||
|
||||
**If no correct seam exists, that itself is the finding.** Note it. The codebase architecture is preventing the bug from being locked down. Flag this for the next phase.
|
||||
|
||||
If a correct seam exists:
|
||||
|
||||
1. Turn the minimised repro into a failing test at that seam.
|
||||
2. Watch it fail.
|
||||
3. Apply the fix.
|
||||
4. Watch it pass.
|
||||
5. Re-run the Phase 1 feedback loop against the original (un-minimised) scenario.
|
||||
|
||||
## Phase 6 — Cleanup + post-mortem
|
||||
|
||||
Required before declaring done:
|
||||
|
||||
- [ ] Original repro no longer reproduces (re-run the Phase 1 loop)
|
||||
- [ ] Regression test passes (or absence of seam is documented)
|
||||
- [ ] All `[DEBUG-...]` instrumentation removed (`grep` the prefix)
|
||||
- [ ] Throwaway prototypes deleted (or moved to a clearly-marked debug location)
|
||||
- [ ] The hypothesis that turned out correct is stated in the commit / PR message — so the next debugger learns
|
||||
|
||||
**Then ask: what would have prevented this bug?** If the answer involves architectural change (no good test seam, tangled callers, hidden coupling) hand off to the `/improve-codebase-architecture` skill with the specifics. Make the recommendation **after** the fix is in, not before — you have more information now than when you started.
|
||||
41
.agents/skills/diagnose/scripts/hitl-loop.template.sh
Normal file
41
.agents/skills/diagnose/scripts/hitl-loop.template.sh
Normal file
@@ -0,0 +1,41 @@
|
||||
#!/usr/bin/env bash
|
||||
# Human-in-the-loop reproduction loop.
|
||||
# Copy this file, edit the steps below, and run it.
|
||||
# The agent runs the script; the user follows prompts in their terminal.
|
||||
#
|
||||
# Usage:
|
||||
# bash hitl-loop.template.sh
|
||||
#
|
||||
# Two helpers:
|
||||
# step "<instruction>" → show instruction, wait for Enter
|
||||
# capture VAR "<question>" → show question, read response into VAR
|
||||
#
|
||||
# At the end, captured values are printed as KEY=VALUE for the agent to parse.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
step() {
|
||||
printf '\n>>> %s\n' "$1"
|
||||
read -r -p " [Enter when done] " _
|
||||
}
|
||||
|
||||
capture() {
|
||||
local var="$1" question="$2" answer
|
||||
printf '\n>>> %s\n' "$question"
|
||||
read -r -p " > " answer
|
||||
printf -v "$var" '%s' "$answer"
|
||||
}
|
||||
|
||||
# --- edit below ---------------------------------------------------------
|
||||
|
||||
step "Open the app at http://localhost:3000 and sign in."
|
||||
|
||||
capture ERRORED "Click the 'Export' button. Did it throw an error? (y/n)"
|
||||
|
||||
capture ERROR_MSG "Paste the error message (or 'none'):"
|
||||
|
||||
# --- edit above ---------------------------------------------------------
|
||||
|
||||
printf '\n--- Captured ---\n'
|
||||
printf 'ERRORED=%s\n' "$ERRORED"
|
||||
printf 'ERROR_MSG=%s\n' "$ERROR_MSG"
|
||||
10
.agents/skills/grill-me/SKILL.md
Normal file
10
.agents/skills/grill-me/SKILL.md
Normal file
@@ -0,0 +1,10 @@
|
||||
---
|
||||
name: grill-me
|
||||
description: Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. Use when user wants to stress-test a plan, get grilled on their design, or mentions "grill me".
|
||||
---
|
||||
|
||||
Interview me relentlessly about every aspect of this plan until we reach a shared understanding. Walk down each branch of the design tree, resolving dependencies between decisions one-by-one. For each question, provide your recommended answer.
|
||||
|
||||
Ask the questions one at a time.
|
||||
|
||||
If a question can be answered by exploring the codebase, explore the codebase instead.
|
||||
47
.agents/skills/grill-with-docs/ADR-FORMAT.md
Normal file
47
.agents/skills/grill-with-docs/ADR-FORMAT.md
Normal file
@@ -0,0 +1,47 @@
|
||||
# ADR Format
|
||||
|
||||
ADRs live in `docs/adr/` and use sequential numbering: `0001-slug.md`, `0002-slug.md`, etc.
|
||||
|
||||
Create the `docs/adr/` directory lazily — only when the first ADR is needed.
|
||||
|
||||
## Template
|
||||
|
||||
```md
|
||||
# {Short title of the decision}
|
||||
|
||||
{1-3 sentences: what's the context, what did we decide, and why.}
|
||||
```
|
||||
|
||||
That's it. An ADR can be a single paragraph. The value is in recording *that* a decision was made and *why* — not in filling out sections.
|
||||
|
||||
## Optional sections
|
||||
|
||||
Only include these when they add genuine value. Most ADRs won't need them.
|
||||
|
||||
- **Status** frontmatter (`proposed | accepted | deprecated | superseded by ADR-NNNN`) — useful when decisions are revisited
|
||||
- **Considered Options** — only when the rejected alternatives are worth remembering
|
||||
- **Consequences** — only when non-obvious downstream effects need to be called out
|
||||
|
||||
## Numbering
|
||||
|
||||
Scan `docs/adr/` for the highest existing number and increment by one.
|
||||
|
||||
## When to offer an ADR
|
||||
|
||||
All three of these must be true:
|
||||
|
||||
1. **Hard to reverse** — the cost of changing your mind later is meaningful
|
||||
2. **Surprising without context** — a future reader will look at the code and wonder "why on earth did they do it this way?"
|
||||
3. **The result of a real trade-off** — there were genuine alternatives and you picked one for specific reasons
|
||||
|
||||
If a decision is easy to reverse, skip it — you'll just reverse it. If it's not surprising, nobody will wonder why. If there was no real alternative, there's nothing to record beyond "we did the obvious thing."
|
||||
|
||||
### What qualifies
|
||||
|
||||
- **Architectural shape.** "We're using a monorepo." "The write model is event-sourced, the read model is projected into Postgres."
|
||||
- **Integration patterns between contexts.** "Ordering and Billing communicate via domain events, not synchronous HTTP."
|
||||
- **Technology choices that carry lock-in.** Database, message bus, auth provider, deployment target. Not every library — just the ones that would take a quarter to swap out.
|
||||
- **Boundary and scope decisions.** "Customer data is owned by the Customer context; other contexts reference it by ID only." The explicit no-s are as valuable as the yes-s.
|
||||
- **Deliberate deviations from the obvious path.** "We're using manual SQL instead of an ORM because X." Anything where a reasonable reader would assume the opposite. These stop the next engineer from "fixing" something that was deliberate.
|
||||
- **Constraints not visible in the code.** "We can't use AWS because of compliance requirements." "Response times must be under 200ms because of the partner API contract."
|
||||
- **Rejected alternatives when the rejection is non-obvious.** If you considered GraphQL and picked REST for subtle reasons, record it — otherwise someone will suggest GraphQL again in six months.
|
||||
60
.agents/skills/grill-with-docs/CONTEXT-FORMAT.md
Normal file
60
.agents/skills/grill-with-docs/CONTEXT-FORMAT.md
Normal file
@@ -0,0 +1,60 @@
|
||||
# CONTEXT.md Format
|
||||
|
||||
## Structure
|
||||
|
||||
```md
|
||||
# {Context Name}
|
||||
|
||||
{One or two sentence description of what this context is and why it exists.}
|
||||
|
||||
## Language
|
||||
|
||||
**Order**:
|
||||
{A one or two sentence description of the term}
|
||||
_Avoid_: Purchase, transaction
|
||||
|
||||
**Invoice**:
|
||||
A request for payment sent to a customer after delivery.
|
||||
_Avoid_: Bill, payment request
|
||||
|
||||
**Customer**:
|
||||
A person or organization that places orders.
|
||||
_Avoid_: Client, buyer, account
|
||||
```
|
||||
|
||||
## Rules
|
||||
|
||||
- **Be opinionated.** When multiple words exist for the same concept, pick the best one and list the others under `_Avoid_`.
|
||||
- **Keep definitions tight.** One or two sentences max. Define what it IS, not what it does.
|
||||
- **Only include terms specific to this project's context.** General programming concepts (timeouts, error types, utility patterns) don't belong even if the project uses them extensively. Before adding a term, ask: is this a concept unique to this context, or a general programming concept? Only the former belongs.
|
||||
- **Group terms under subheadings** when natural clusters emerge. If all terms belong to a single cohesive area, a flat list is fine.
|
||||
|
||||
## Single vs multi-context repos
|
||||
|
||||
**Single context (most repos):** One `CONTEXT.md` at the repo root.
|
||||
|
||||
**Multiple contexts:** A `CONTEXT-MAP.md` at the repo root lists the contexts, where they live, and how they relate to each other:
|
||||
|
||||
```md
|
||||
# Context Map
|
||||
|
||||
## Contexts
|
||||
|
||||
- [Ordering](./src/ordering/CONTEXT.md) — receives and tracks customer orders
|
||||
- [Billing](./src/billing/CONTEXT.md) — generates invoices and processes payments
|
||||
- [Fulfillment](./src/fulfillment/CONTEXT.md) — manages warehouse picking and shipping
|
||||
|
||||
## Relationships
|
||||
|
||||
- **Ordering → Fulfillment**: Ordering emits `OrderPlaced` events; Fulfillment consumes them to start picking
|
||||
- **Fulfillment → Billing**: Fulfillment emits `ShipmentDispatched` events; Billing consumes them to generate invoices
|
||||
- **Ordering ↔ Billing**: Shared types for `CustomerId` and `Money`
|
||||
```
|
||||
|
||||
The skill infers which structure applies:
|
||||
|
||||
- If `CONTEXT-MAP.md` exists, read it to find contexts
|
||||
- If only a root `CONTEXT.md` exists, single context
|
||||
- If neither exists, create a root `CONTEXT.md` lazily when the first term is resolved
|
||||
|
||||
When multiple contexts exist, infer which one the current topic relates to. If unclear, ask.
|
||||
88
.agents/skills/grill-with-docs/SKILL.md
Normal file
88
.agents/skills/grill-with-docs/SKILL.md
Normal file
@@ -0,0 +1,88 @@
|
||||
---
|
||||
name: grill-with-docs
|
||||
description: Grilling session that challenges your plan against the existing domain model, sharpens terminology, and updates documentation (CONTEXT.md, ADRs) inline as decisions crystallise. Use when user wants to stress-test a plan against their project's language and documented decisions.
|
||||
---
|
||||
|
||||
<what-to-do>
|
||||
|
||||
Interview me relentlessly about every aspect of this plan until we reach a shared understanding. Walk down each branch of the design tree, resolving dependencies between decisions one-by-one. For each question, provide your recommended answer.
|
||||
|
||||
Ask the questions one at a time, waiting for feedback on each question before continuing.
|
||||
|
||||
If a question can be answered by exploring the codebase, explore the codebase instead.
|
||||
|
||||
</what-to-do>
|
||||
|
||||
<supporting-info>
|
||||
|
||||
## Domain awareness
|
||||
|
||||
During codebase exploration, also look for existing documentation:
|
||||
|
||||
### File structure
|
||||
|
||||
Most repos have a single context:
|
||||
|
||||
```
|
||||
/
|
||||
├── CONTEXT.md
|
||||
├── docs/
|
||||
│ └── adr/
|
||||
│ ├── 0001-event-sourced-orders.md
|
||||
│ └── 0002-postgres-for-write-model.md
|
||||
└── src/
|
||||
```
|
||||
|
||||
If a `CONTEXT-MAP.md` exists at the root, the repo has multiple contexts. The map points to where each one lives:
|
||||
|
||||
```
|
||||
/
|
||||
├── CONTEXT-MAP.md
|
||||
├── docs/
|
||||
│ └── adr/ ← system-wide decisions
|
||||
├── src/
|
||||
│ ├── ordering/
|
||||
│ │ ├── CONTEXT.md
|
||||
│ │ └── docs/adr/ ← context-specific decisions
|
||||
│ └── billing/
|
||||
│ ├── CONTEXT.md
|
||||
│ └── docs/adr/
|
||||
```
|
||||
|
||||
Create files lazily — only when you have something to write. If no `CONTEXT.md` exists, create one when the first term is resolved. If no `docs/adr/` exists, create it when the first ADR is needed.
|
||||
|
||||
## During the session
|
||||
|
||||
### Challenge against the glossary
|
||||
|
||||
When the user uses a term that conflicts with the existing language in `CONTEXT.md`, call it out immediately. "Your glossary defines 'cancellation' as X, but you seem to mean Y — which is it?"
|
||||
|
||||
### Sharpen fuzzy language
|
||||
|
||||
When the user uses vague or overloaded terms, propose a precise canonical term. "You're saying 'account' — do you mean the Customer or the User? Those are different things."
|
||||
|
||||
### Discuss concrete scenarios
|
||||
|
||||
When domain relationships are being discussed, stress-test them with specific scenarios. Invent scenarios that probe edge cases and force the user to be precise about the boundaries between concepts.
|
||||
|
||||
### Cross-reference with code
|
||||
|
||||
When the user states how something works, check whether the code agrees. If you find a contradiction, surface it: "Your code cancels entire Orders, but you just said partial cancellation is possible — which is right?"
|
||||
|
||||
### Update CONTEXT.md inline
|
||||
|
||||
When a term is resolved, update `CONTEXT.md` right there. Don't batch these up — capture them as they happen. Use the format in [CONTEXT-FORMAT.md](./CONTEXT-FORMAT.md).
|
||||
|
||||
`CONTEXT.md` should be totally devoid of implementation details. Do not treat `CONTEXT.md` as a spec, a scratch pad, or a repository for implementation decisions. It is a glossary and nothing else.
|
||||
|
||||
### Offer ADRs sparingly
|
||||
|
||||
Only offer to create an ADR when all three are true:
|
||||
|
||||
1. **Hard to reverse** — the cost of changing your mind later is meaningful
|
||||
2. **Surprising without context** — a future reader will wonder "why did they do it this way?"
|
||||
3. **The result of a real trade-off** — there were genuine alternatives and you picked one for specific reasons
|
||||
|
||||
If any of the three is missing, skip the ADR. Use the format in [ADR-FORMAT.md](./ADR-FORMAT.md).
|
||||
|
||||
</supporting-info>
|
||||
15
.agents/skills/handoff/SKILL.md
Normal file
15
.agents/skills/handoff/SKILL.md
Normal file
@@ -0,0 +1,15 @@
|
||||
---
|
||||
name: handoff
|
||||
description: Compact the current conversation into a handoff document for another agent to pick up.
|
||||
argument-hint: "What will the next session be used for?"
|
||||
---
|
||||
|
||||
Write a handoff document summarising the current conversation so a fresh agent can continue the work. Save to the temporary directory of the user's OS - not the current workspace.
|
||||
|
||||
Include a "suggested skills" section in the document, which suggests skills that the agent should invoke.
|
||||
|
||||
Do not duplicate content already captured in other artifacts (PRDs, plans, ADRs, issues, commits, diffs). Reference them by path or URL instead.
|
||||
|
||||
Redact any sensitive information, such as API keys, passwords, or personally identifiable information.
|
||||
|
||||
If the user passed arguments, treat them as a description of what the next session will focus on and tailor the doc accordingly.
|
||||
37
.agents/skills/improve-codebase-architecture/DEEPENING.md
Normal file
37
.agents/skills/improve-codebase-architecture/DEEPENING.md
Normal file
@@ -0,0 +1,37 @@
|
||||
# Deepening
|
||||
|
||||
How to deepen a cluster of shallow modules safely, given its dependencies. Assumes the vocabulary in [LANGUAGE.md](LANGUAGE.md) — **module**, **interface**, **seam**, **adapter**.
|
||||
|
||||
## Dependency categories
|
||||
|
||||
When assessing a candidate for deepening, classify its dependencies. The category determines how the deepened module is tested across its seam.
|
||||
|
||||
### 1. In-process
|
||||
|
||||
Pure computation, in-memory state, no I/O. Always deepenable — merge the modules and test through the new interface directly. No adapter needed.
|
||||
|
||||
### 2. Local-substitutable
|
||||
|
||||
Dependencies that have local test stand-ins (PGLite for Postgres, in-memory filesystem). Deepenable if the stand-in exists. The deepened module is tested with the stand-in running in the test suite. The seam is internal; no port at the module's external interface.
|
||||
|
||||
### 3. Remote but owned (Ports & Adapters)
|
||||
|
||||
Your own services across a network boundary (microservices, internal APIs). Define a **port** (interface) at the seam. The deep module owns the logic; the transport is injected as an **adapter**. Tests use an in-memory adapter. Production uses an HTTP/gRPC/queue adapter.
|
||||
|
||||
Recommendation shape: *"Define a port at the seam, implement an HTTP adapter for production and an in-memory adapter for testing, so the logic sits in one deep module even though it's deployed across a network."*
|
||||
|
||||
### 4. True external (Mock)
|
||||
|
||||
Third-party services (Stripe, Twilio, etc.) you don't control. The deepened module takes the external dependency as an injected port; tests provide a mock adapter.
|
||||
|
||||
## Seam discipline
|
||||
|
||||
- **One adapter means a hypothetical seam. Two adapters means a real one.** Don't introduce a port unless at least two adapters are justified (typically production + test). A single-adapter seam is just indirection.
|
||||
- **Internal seams vs external seams.** A deep module can have internal seams (private to its implementation, used by its own tests) as well as the external seam at its interface. Don't expose internal seams through the interface just because tests use them.
|
||||
|
||||
## Testing strategy: replace, don't layer
|
||||
|
||||
- Old unit tests on shallow modules become waste once tests at the deepened module's interface exist — delete them.
|
||||
- Write new tests at the deepened module's interface. The **interface is the test surface**.
|
||||
- Tests assert on observable outcomes through the interface, not internal state.
|
||||
- Tests should survive internal refactors — they describe behaviour, not implementation. If a test has to change when the implementation changes, it's testing past the interface.
|
||||
123
.agents/skills/improve-codebase-architecture/HTML-REPORT.md
Normal file
123
.agents/skills/improve-codebase-architecture/HTML-REPORT.md
Normal file
@@ -0,0 +1,123 @@
|
||||
# HTML Report Format
|
||||
|
||||
The architectural review is rendered as a single self-contained HTML file in the OS temp directory. Tailwind and Mermaid both come from CDNs. Mermaid handles graph-shaped diagrams reliably; hand-built divs and inline SVG handle the more editorial visuals (mass diagrams, cross-sections). Mix the two — don't lean on Mermaid for everything, it'll start to look generic.
|
||||
|
||||
## Scaffold
|
||||
|
||||
```html
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>Architecture review — {{repo name}}</title>
|
||||
<script src="https://cdn.tailwindcss.com"></script>
|
||||
<script type="module">
|
||||
import mermaid from "https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs";
|
||||
mermaid.initialize({ startOnLoad: true, theme: "neutral", securityLevel: "loose" });
|
||||
</script>
|
||||
<style>
|
||||
/* small custom layer for things Tailwind doesn't cover cleanly:
|
||||
dashed seam lines, hand-drawn-feeling arrow heads, etc. */
|
||||
.seam { stroke-dasharray: 4 4; }
|
||||
.leak { stroke: #dc2626; }
|
||||
.deep { background: linear-gradient(135deg, #0f172a, #1e293b); }
|
||||
</style>
|
||||
</head>
|
||||
<body class="bg-stone-50 text-slate-900 font-sans">
|
||||
<main class="max-w-5xl mx-auto px-6 py-12 space-y-12">
|
||||
<header>...</header>
|
||||
<section id="candidates" class="space-y-10">...</section>
|
||||
<section id="top-recommendation">...</section>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
## Header
|
||||
|
||||
Repo name, date, and a compact legend: solid box = module, dashed line = seam, red arrow = leakage, thick dark box = deep module. No introduction paragraph — straight into the candidates.
|
||||
|
||||
## Candidate card
|
||||
|
||||
The diagrams carry the weight. Prose is sparse, plain, and uses the glossary terms ([LANGUAGE.md](LANGUAGE.md)) without ceremony.
|
||||
|
||||
Each candidate is one `<article>`:
|
||||
|
||||
- **Title** — short, names the deepening (e.g. "Collapse the Order intake pipeline").
|
||||
- **Badge row** — recommendation strength (`Strong` = emerald, `Worth exploring` = amber, `Speculative` = slate), plus a tag for the dependency category (`in-process`, `local-substitutable`, `ports & adapters`, `mock`).
|
||||
- **Files** — monospaced list, `font-mono text-sm`.
|
||||
- **Before / After diagram** — the centrepiece. Two columns, side by side. See patterns below.
|
||||
- **Problem** — one sentence. What hurts.
|
||||
- **Solution** — one sentence. What changes.
|
||||
- **Wins** — bullets, ≤6 words each. e.g. "Tests hit one interface", "Pricing logic stops leaking", "Delete 4 shallow wrappers".
|
||||
- **ADR callout** (if applicable) — one line in an amber-tinted box.
|
||||
|
||||
No paragraphs of explanation. If the diagram needs a paragraph to be understood, redraw the diagram.
|
||||
|
||||
## Diagram patterns
|
||||
|
||||
Pick the pattern that fits the candidate. Mix them. Don't make every diagram look the same — variety is part of the point.
|
||||
|
||||
### Mermaid graph (the workhorse for dependencies / call flow)
|
||||
|
||||
Use a Mermaid `flowchart` or `graph` when the point is "X calls Y calls Z, and look at the mess." Wrap it in a Tailwind-styled card so it doesn't feel parachuted in. Style with classDef to colour leakage edges red and the deep module dark. Sequence diagrams work well for "before: 6 round-trips; after: 1."
|
||||
|
||||
```html
|
||||
<div class="rounded-lg border border-slate-200 bg-white p-4">
|
||||
<pre class="mermaid">
|
||||
flowchart LR
|
||||
A[OrderHandler] --> B[OrderValidator]
|
||||
B --> C[OrderRepo]
|
||||
C -.leak.-> D[PricingClient]
|
||||
classDef leak stroke:#dc2626,stroke-width:2px;
|
||||
class C,D leak
|
||||
</pre>
|
||||
</div>
|
||||
```
|
||||
|
||||
### Hand-built boxes-and-arrows (when Mermaid's layout fights you)
|
||||
|
||||
Modules as `<div>`s with borders and labels. Arrows as inline SVG `<line>` or `<path>` elements positioned absolutely over a relative container. Reach for this when you want the "after" diagram to feel like one thick-bordered deep module with greyed-out internals — Mermaid won't render that with the right weight.
|
||||
|
||||
### Cross-section (good for layered shallowness)
|
||||
|
||||
Stack horizontal bands (`h-12 border-l-4`) to show layers a call passes through. Before: 6 thin layers each doing nothing. After: 1 thick band labelled with the consolidated responsibility.
|
||||
|
||||
### Mass diagram (good for "interface as wide as implementation")
|
||||
|
||||
Two rectangles per module — one for interface surface area, one for implementation. Before: interface rectangle is nearly as tall as the implementation rectangle (shallow). After: interface rectangle is short, implementation rectangle is tall (deep).
|
||||
|
||||
### Call-graph collapse
|
||||
|
||||
Before: a tree of function calls rendered as nested boxes. After: the same tree collapsed into one box, with the now-internal calls shown faded inside it.
|
||||
|
||||
## Style guidance
|
||||
|
||||
- Lean editorial, not corporate-dashboard. Generous whitespace. Serif optional for headings (`font-serif` works well with stone/slate).
|
||||
- Colour sparingly: one accent (emerald or indigo) plus red for leakage and amber for warnings.
|
||||
- Keep diagrams ~320px tall so before/after sits comfortably side by side without scrolling.
|
||||
- Use `text-xs uppercase tracking-wider` for module labels inside diagrams — they should read as schematic, not as UI.
|
||||
- The only scripts are the Tailwind CDN and the Mermaid ESM import. The report is otherwise static — no app code, no interactivity beyond Mermaid's own rendering.
|
||||
|
||||
## Top recommendation section
|
||||
|
||||
One larger card. Candidate name, one sentence on why, anchor link to its card. That's it.
|
||||
|
||||
## Tone
|
||||
|
||||
Plain English, concise — but the architectural nouns and verbs come straight from [LANGUAGE.md](LANGUAGE.md). Concision is not an excuse to drift.
|
||||
|
||||
**Use exactly:** module, interface, implementation, depth, deep, shallow, seam, adapter, leverage, locality.
|
||||
|
||||
**Never substitute:** component, service, unit (for module) · API, signature (for interface) · boundary (for seam) · layer, wrapper (for module, when you mean module).
|
||||
|
||||
**Phrasings that fit the style:**
|
||||
|
||||
- "Order intake module is shallow — interface nearly matches the implementation."
|
||||
- "Pricing leaks across the seam."
|
||||
- "Deepen: one interface, one place to test."
|
||||
- "Two adapters justify the seam: HTTP in prod, in-memory in tests."
|
||||
|
||||
**Wins bullets** name the gain in glossary terms: *"locality: bugs concentrate in one module"*, *"leverage: one interface, N call sites"*, *"interface shrinks; implementation absorbs the wrappers"*. Don't write *"easier to maintain"* or *"cleaner code"* — those terms aren't in the glossary and don't earn their place.
|
||||
|
||||
No hedging, no throat-clearing, no "it's worth noting that…". If a sentence could be a bullet, make it a bullet. If a bullet could be cut, cut it. If a term isn't in [LANGUAGE.md](LANGUAGE.md), reach for one that is before inventing a new one.
|
||||
@@ -0,0 +1,44 @@
|
||||
# Interface Design
|
||||
|
||||
When the user wants to explore alternative interfaces for a chosen deepening candidate, use this parallel sub-agent pattern. Based on "Design It Twice" (Ousterhout) — your first idea is unlikely to be the best.
|
||||
|
||||
Uses the vocabulary in [LANGUAGE.md](LANGUAGE.md) — **module**, **interface**, **seam**, **adapter**, **leverage**.
|
||||
|
||||
## Process
|
||||
|
||||
### 1. Frame the problem space
|
||||
|
||||
Before spawning sub-agents, write a user-facing explanation of the problem space for the chosen candidate:
|
||||
|
||||
- The constraints any new interface would need to satisfy
|
||||
- The dependencies it would rely on, and which category they fall into (see [DEEPENING.md](DEEPENING.md))
|
||||
- A rough illustrative code sketch to ground the constraints — not a proposal, just a way to make the constraints concrete
|
||||
|
||||
Show this to the user, then immediately proceed to Step 2. The user reads and thinks while the sub-agents work in parallel.
|
||||
|
||||
### 2. Spawn sub-agents
|
||||
|
||||
Spawn 3+ sub-agents in parallel using the Agent tool. Each must produce a **radically different** interface for the deepened module.
|
||||
|
||||
Prompt each sub-agent with a separate technical brief (file paths, coupling details, dependency category from [DEEPENING.md](DEEPENING.md), what sits behind the seam). The brief is independent of the user-facing problem-space explanation in Step 1. Give each agent a different design constraint:
|
||||
|
||||
- Agent 1: "Minimize the interface — aim for 1–3 entry points max. Maximise leverage per entry point."
|
||||
- Agent 2: "Maximise flexibility — support many use cases and extension."
|
||||
- Agent 3: "Optimise for the most common caller — make the default case trivial."
|
||||
- Agent 4 (if applicable): "Design around ports & adapters for cross-seam dependencies."
|
||||
|
||||
Include both [LANGUAGE.md](LANGUAGE.md) vocabulary and CONTEXT.md vocabulary in the brief so each sub-agent names things consistently with the architecture language and the project's domain language.
|
||||
|
||||
Each sub-agent outputs:
|
||||
|
||||
1. Interface (types, methods, params — plus invariants, ordering, error modes)
|
||||
2. Usage example showing how callers use it
|
||||
3. What the implementation hides behind the seam
|
||||
4. Dependency strategy and adapters (see [DEEPENING.md](DEEPENING.md))
|
||||
5. Trade-offs — where leverage is high, where it's thin
|
||||
|
||||
### 3. Present and compare
|
||||
|
||||
Present designs sequentially so the user can absorb each one, then compare them in prose. Contrast by **depth** (leverage at the interface), **locality** (where change concentrates), and **seam placement**.
|
||||
|
||||
After comparing, give your own recommendation: which design you think is strongest and why. If elements from different designs would combine well, propose a hybrid. Be opinionated — the user wants a strong read, not a menu.
|
||||
53
.agents/skills/improve-codebase-architecture/LANGUAGE.md
Normal file
53
.agents/skills/improve-codebase-architecture/LANGUAGE.md
Normal file
@@ -0,0 +1,53 @@
|
||||
# Language
|
||||
|
||||
Shared vocabulary for every suggestion this skill makes. Use these terms exactly — don't substitute "component," "service," "API," or "boundary." Consistent language is the whole point.
|
||||
|
||||
## Terms
|
||||
|
||||
**Module**
|
||||
Anything with an interface and an implementation. Deliberately scale-agnostic — applies equally to a function, class, package, or tier-spanning slice.
|
||||
_Avoid_: unit, component, service.
|
||||
|
||||
**Interface**
|
||||
Everything a caller must know to use the module correctly. Includes the type signature, but also invariants, ordering constraints, error modes, required configuration, and performance characteristics.
|
||||
_Avoid_: API, signature (too narrow — those refer only to the type-level surface).
|
||||
|
||||
**Implementation**
|
||||
What's inside a module — its body of code. Distinct from **Adapter**: a thing can be a small adapter with a large implementation (a Postgres repo) or a large adapter with a small implementation (an in-memory fake). Reach for "adapter" when the seam is the topic; "implementation" otherwise.
|
||||
|
||||
**Depth**
|
||||
Leverage at the interface — the amount of behaviour a caller (or test) can exercise per unit of interface they have to learn. A module is **deep** when a large amount of behaviour sits behind a small interface. A module is **shallow** when the interface is nearly as complex as the implementation.
|
||||
|
||||
**Seam** _(from Michael Feathers)_
|
||||
A place where you can alter behaviour without editing in that place. The *location* at which a module's interface lives. Choosing where to put the seam is its own design decision, distinct from what goes behind it.
|
||||
_Avoid_: boundary (overloaded with DDD's bounded context).
|
||||
|
||||
**Adapter**
|
||||
A concrete thing that satisfies an interface at a seam. Describes *role* (what slot it fills), not substance (what's inside).
|
||||
|
||||
**Leverage**
|
||||
What callers get from depth. More capability per unit of interface they have to learn. One implementation pays back across N call sites and M tests.
|
||||
|
||||
**Locality**
|
||||
What maintainers get from depth. Change, bugs, knowledge, and verification concentrate at one place rather than spreading across callers. Fix once, fixed everywhere.
|
||||
|
||||
## Principles
|
||||
|
||||
- **Depth is a property of the interface, not the implementation.** A deep module can be internally composed of small, mockable, swappable parts — they just aren't part of the interface. A module can have **internal seams** (private to its implementation, used by its own tests) as well as the **external seam** at its interface.
|
||||
- **The deletion test.** Imagine deleting the module. If complexity vanishes, the module wasn't hiding anything (it was a pass-through). If complexity reappears across N callers, the module was earning its keep.
|
||||
- **The interface is the test surface.** Callers and tests cross the same seam. If you want to test *past* the interface, the module is probably the wrong shape.
|
||||
- **One adapter means a hypothetical seam. Two adapters means a real one.** Don't introduce a seam unless something actually varies across it.
|
||||
|
||||
## Relationships
|
||||
|
||||
- A **Module** has exactly one **Interface** (the surface it presents to callers and tests).
|
||||
- **Depth** is a property of a **Module**, measured against its **Interface**.
|
||||
- A **Seam** is where a **Module**'s **Interface** lives.
|
||||
- An **Adapter** sits at a **Seam** and satisfies the **Interface**.
|
||||
- **Depth** produces **Leverage** for callers and **Locality** for maintainers.
|
||||
|
||||
## Rejected framings
|
||||
|
||||
- **Depth as ratio of implementation-lines to interface-lines** (Ousterhout): rewards padding the implementation. We use depth-as-leverage instead.
|
||||
- **"Interface" as the TypeScript `interface` keyword or a class's public methods**: too narrow — interface here includes every fact a caller must know.
|
||||
- **"Boundary"**: overloaded with DDD's bounded context. Say **seam** or **interface**.
|
||||
81
.agents/skills/improve-codebase-architecture/SKILL.md
Normal file
81
.agents/skills/improve-codebase-architecture/SKILL.md
Normal file
@@ -0,0 +1,81 @@
|
||||
---
|
||||
name: improve-codebase-architecture
|
||||
description: Find deepening opportunities in a codebase, informed by the domain language in CONTEXT.md and the decisions in docs/adr/. Use when the user wants to improve architecture, find refactoring opportunities, consolidate tightly-coupled modules, or make a codebase more testable and AI-navigable.
|
||||
---
|
||||
|
||||
# Improve Codebase Architecture
|
||||
|
||||
Surface architectural friction and propose **deepening opportunities** — refactors that turn shallow modules into deep ones. The aim is testability and AI-navigability.
|
||||
|
||||
## Glossary
|
||||
|
||||
Use these terms exactly in every suggestion. Consistent language is the point — don't drift into "component," "service," "API," or "boundary." Full definitions in [LANGUAGE.md](LANGUAGE.md).
|
||||
|
||||
- **Module** — anything with an interface and an implementation (function, class, package, slice).
|
||||
- **Interface** — everything a caller must know to use the module: types, invariants, error modes, ordering, config. Not just the type signature.
|
||||
- **Implementation** — the code inside.
|
||||
- **Depth** — leverage at the interface: a lot of behaviour behind a small interface. **Deep** = high leverage. **Shallow** = interface nearly as complex as the implementation.
|
||||
- **Seam** — where an interface lives; a place behaviour can be altered without editing in place. (Use this, not "boundary.")
|
||||
- **Adapter** — a concrete thing satisfying an interface at a seam.
|
||||
- **Leverage** — what callers get from depth.
|
||||
- **Locality** — what maintainers get from depth: change, bugs, knowledge concentrated in one place.
|
||||
|
||||
Key principles (see [LANGUAGE.md](LANGUAGE.md) for the full list):
|
||||
|
||||
- **Deletion test**: imagine deleting the module. If complexity vanishes, it was a pass-through. If complexity reappears across N callers, it was earning its keep.
|
||||
- **The interface is the test surface.**
|
||||
- **One adapter = hypothetical seam. Two adapters = real seam.**
|
||||
|
||||
This skill is _informed_ by the project's domain model. The domain language gives names to good seams; ADRs record decisions the skill should not re-litigate.
|
||||
|
||||
## Process
|
||||
|
||||
### 1. Explore
|
||||
|
||||
Read the project's domain glossary and any ADRs in the area you're touching first.
|
||||
|
||||
Then use the Agent tool with `subagent_type=Explore` to walk the codebase. Don't follow rigid heuristics — explore organically and note where you experience friction:
|
||||
|
||||
- Where does understanding one concept require bouncing between many small modules?
|
||||
- Where are modules **shallow** — interface nearly as complex as the implementation?
|
||||
- Where have pure functions been extracted just for testability, but the real bugs hide in how they're called (no **locality**)?
|
||||
- Where do tightly-coupled modules leak across their seams?
|
||||
- Which parts of the codebase are untested, or hard to test through their current interface?
|
||||
|
||||
Apply the **deletion test** to anything you suspect is shallow: would deleting it concentrate complexity, or just move it? A "yes, concentrates" is the signal you want.
|
||||
|
||||
### 2. Present candidates as an HTML report
|
||||
|
||||
Write a self-contained HTML file to the OS temp directory so nothing lands in the repo. Resolve the temp dir from `$TMPDIR`, falling back to `/tmp` (or `%TEMP%` on Windows), and write to `<tmpdir>/architecture-review-<timestamp>.html` so each run gets a fresh file. Open it for the user — `xdg-open <path>` on Linux, `open <path>` on macOS, `start <path>` on Windows — and tell them the absolute path.
|
||||
|
||||
The report uses **Tailwind via CDN** for layout and styling, and **Mermaid via CDN** for diagrams where a graph/flow/sequence reliably communicates the structure. Mix Mermaid with hand-crafted CSS/SVG visuals — use Mermaid when relationships are graph-shaped (call graphs, dependencies, sequences), and hand-built divs/SVG when you want something more editorial (mass diagrams, cross-sections, collapse animations). Each candidate gets a **before/after visualisation**. Be visual.
|
||||
|
||||
For each candidate, the same template as before, but rendered as a card:
|
||||
|
||||
- **Files** — which files/modules are involved
|
||||
- **Problem** — why the current architecture is causing friction
|
||||
- **Solution** — plain English description of what would change
|
||||
- **Benefits** — explained in terms of locality and leverage, and how tests would improve
|
||||
- **Before / After diagram** — side-by-side, custom-drawn, illustrating the shallowness and the deepening
|
||||
- **Recommendation strength** — one of `Strong`, `Worth exploring`, `Speculative`, rendered as a badge
|
||||
|
||||
End the report with a **Top recommendation** section: which candidate you'd tackle first and why.
|
||||
|
||||
**Use CONTEXT.md vocabulary for the domain, and [LANGUAGE.md](LANGUAGE.md) vocabulary for the architecture.** If `CONTEXT.md` defines "Order," talk about "the Order intake module" — not "the FooBarHandler," and not "the Order service."
|
||||
|
||||
**ADR conflicts**: if a candidate contradicts an existing ADR, only surface it when the friction is real enough to warrant revisiting the ADR. Mark it clearly in the card (e.g. a warning callout: _"contradicts ADR-0007 — but worth reopening because…"_). Don't list every theoretical refactor an ADR forbids.
|
||||
|
||||
See [HTML-REPORT.md](HTML-REPORT.md) for the full HTML scaffold, diagram patterns, and styling guidance.
|
||||
|
||||
Do NOT propose interfaces yet. After the file is written, ask the user: "Which of these would you like to explore?"
|
||||
|
||||
### 3. Grilling loop
|
||||
|
||||
Once the user picks a candidate, drop into a grilling conversation. Walk the design tree with them — constraints, dependencies, the shape of the deepened module, what sits behind the seam, what tests survive.
|
||||
|
||||
Side effects happen inline as decisions crystallize:
|
||||
|
||||
- **Naming a deepened module after a concept not in `CONTEXT.md`?** Add the term to `CONTEXT.md` — same discipline as `/grill-with-docs` (see [CONTEXT-FORMAT.md](../grill-with-docs/CONTEXT-FORMAT.md)). Create the file lazily if it doesn't exist.
|
||||
- **Sharpening a fuzzy term during the conversation?** Update `CONTEXT.md` right there.
|
||||
- **User rejects the candidate with a load-bearing reason?** Offer an ADR, framed as: _"Want me to record this as an ADR so future architecture reviews don't re-suggest it?"_ Only offer when the reason would actually be needed by a future explorer to avoid re-suggesting the same thing — skip ephemeral reasons ("not worth it right now") and self-evident ones. See [ADR-FORMAT.md](../grill-with-docs/ADR-FORMAT.md).
|
||||
- **Want to explore alternative interfaces for the deepened module?** See [INTERFACE-DESIGN.md](INTERFACE-DESIGN.md).
|
||||
79
.agents/skills/prototype/LOGIC.md
Normal file
79
.agents/skills/prototype/LOGIC.md
Normal file
@@ -0,0 +1,79 @@
|
||||
# Logic Prototype
|
||||
|
||||
A tiny interactive terminal app that lets the user drive a state model by hand. Use this when the question is about **business logic, state transitions, or data shape** — the kind of thing that looks reasonable on paper but only feels wrong once you push it through real cases.
|
||||
|
||||
## When this is the right shape
|
||||
|
||||
- "I'm not sure if this state machine handles the edge case where X then Y."
|
||||
- "Does this data model actually let me represent the case where..."
|
||||
- "I want to feel out what the API should look like before writing it."
|
||||
- Anything where the user wants to **press buttons and watch state change**.
|
||||
|
||||
If the question is "what should this look like" — wrong branch. Use [UI.md](UI.md).
|
||||
|
||||
## Process
|
||||
|
||||
### 1. State the question
|
||||
|
||||
Before writing code, write down what state model and what question you're prototyping. One paragraph, in the prototype's README or a comment at the top of the file. A logic prototype that answers the wrong question is pure waste — make the question explicit so it can be checked later, whether the user is watching now or returning to it AFK.
|
||||
|
||||
### 2. Pick the language
|
||||
|
||||
Use whatever the host project uses. If the project has no obvious runtime (e.g. a docs repo), ask.
|
||||
|
||||
Match the project's existing conventions for tooling — don't add a new package manager or runtime just for the prototype.
|
||||
|
||||
### 3. Isolate the logic in a portable module
|
||||
|
||||
Put the actual logic — the bit that's answering the question — behind a small, pure interface that could be lifted out and dropped into the real codebase later. The TUI around it is throwaway; the logic module shouldn't be.
|
||||
|
||||
The right shape depends on the question:
|
||||
|
||||
- **A pure reducer** — `(state, action) => state`. Good when actions are discrete events and state is a single value.
|
||||
- **A state machine** — explicit states and transitions. Good when "which actions are even legal right now" is part of the question.
|
||||
- **A small set of pure functions** over a plain data type. Good when there's no implicit current state — just transformations.
|
||||
- **A class or module with a clear method surface** when the logic genuinely owns ongoing internal state.
|
||||
|
||||
Pick whichever shape best fits the question being asked, *not* whichever is easiest to wire to a TUI. Keep it pure: no I/O, no terminal code, no `console.log` for control flow. The TUI imports it and calls into it; nothing flows the other direction.
|
||||
|
||||
This is what makes the prototype useful past its own lifetime. When the question's been answered, the validated reducer / machine / function set can be lifted into the real module — the TUI shell gets deleted.
|
||||
|
||||
### 4. Build the smallest TUI that exposes the state
|
||||
|
||||
Build it as a **lightweight TUI** — on every tick, clear the screen (`console.clear()` / `print("\033[2J\033[H")` / equivalent) and re-render the whole frame. The user should always see one stable view, not an ever-growing scrollback.
|
||||
|
||||
Each frame has two parts, in this order:
|
||||
|
||||
1. **Current state**, pretty-printed and diff-friendly (one field per line, or formatted JSON). Use **bold** for field names or section headers and **dim** for less important context (timestamps, IDs, derived values). Native ANSI escape codes are fine — `\x1b[1m` bold, `\x1b[2m` dim, `\x1b[0m` reset. No need to pull in a styling library unless one is already in the project.
|
||||
2. **Keyboard shortcuts**, listed at the bottom: `[a] add user [d] delete user [t] tick clock [q] quit`. Bold the key, dim the description, or vice-versa — whatever reads cleanly.
|
||||
|
||||
Behaviour:
|
||||
|
||||
1. **Initialise state** — a single in-memory object/struct. Render the first frame on start.
|
||||
2. **Read one keystroke (or one line)** at a time, dispatch to a handler that mutates state.
|
||||
3. **Re-render** the full frame after every action — don't append, replace.
|
||||
4. **Loop until quit.**
|
||||
|
||||
The whole frame should fit on one screen.
|
||||
|
||||
### 5. Make it runnable in one command
|
||||
|
||||
Add a script to the project's existing task runner (`package.json` scripts, `Makefile`, `justfile`, `pyproject.toml`). The user should run `pnpm run <prototype-name>` or equivalent — never need to remember a path.
|
||||
|
||||
If the host project has no task runner, just put the command at the top of the prototype's README.
|
||||
|
||||
### 6. Hand it over
|
||||
|
||||
Give the user the run command. They'll drive it themselves; the interesting moments are when they say "wait, that shouldn't be possible" or "huh, I assumed X would be different" — those are the bugs in the _idea_, which is the whole point. If they want new actions added, add them. Prototypes evolve.
|
||||
|
||||
### 7. Capture the answer
|
||||
|
||||
When the prototype has done its job, the answer to the question is the only thing worth keeping. If the user is around, ask what it taught them. If not, leave a `NOTES.md` next to the prototype so the answer can be filled in (or filled in by you, if you've watched the session) before the prototype gets deleted.
|
||||
|
||||
## Anti-patterns
|
||||
|
||||
- **Don't add tests.** A prototype that needs tests is no longer a prototype.
|
||||
- **Don't wire it to the real database.** Use an in-memory store unless the question is specifically about persistence.
|
||||
- **Don't generalise.** No "what if we wanted to support X later." The prototype answers one question.
|
||||
- **Don't blur the logic and the TUI together.** If the reducer / state machine references `console.log`, prompts, or terminal escape codes, it's no longer portable. Keep the TUI as a thin shell over a pure module.
|
||||
- **Don't ship the TUI shell into production.** The shell is optimised for being driven by hand from a terminal. The logic module behind it is the bit worth keeping.
|
||||
30
.agents/skills/prototype/SKILL.md
Normal file
30
.agents/skills/prototype/SKILL.md
Normal file
@@ -0,0 +1,30 @@
|
||||
---
|
||||
name: prototype
|
||||
description: Build a throwaway prototype to flesh out a design before committing to it. Routes between two branches — a runnable terminal app for state/business-logic questions, or several radically different UI variations toggleable from one route. Use when the user wants to prototype, sanity-check a data model or state machine, mock up a UI, explore design options, or says "prototype this", "let me play with it", "try a few designs".
|
||||
---
|
||||
|
||||
# Prototype
|
||||
|
||||
A prototype is **throwaway code that answers a question**. The question decides the shape.
|
||||
|
||||
## Pick a branch
|
||||
|
||||
Identify which question is being answered — from the user's prompt, the surrounding code, or by asking if the user is around:
|
||||
|
||||
- **"Does this logic / state model feel right?"** → [LOGIC.md](LOGIC.md). Build a tiny interactive terminal app that pushes the state machine through cases that are hard to reason about on paper.
|
||||
- **"What should this look like?"** → [UI.md](UI.md). Generate several radically different UI variations on a single route, switchable via a URL search param and a floating bottom bar.
|
||||
|
||||
The two branches produce very different artifacts — getting this wrong wastes the whole prototype. If the question is genuinely ambiguous and the user isn't reachable, default to whichever branch better matches the surrounding code (a backend module → logic; a page or component → UI) and state the assumption at the top of the prototype.
|
||||
|
||||
## Rules that apply to both
|
||||
|
||||
1. **Throwaway from day one, and clearly marked as such.** Locate the prototype code close to where it will actually be used (next to the module or page it's prototyping for) so context is obvious — but name it so a casual reader can see it's a prototype, not production. For throwaway UI routes, obey whatever routing convention the project already uses; don't invent a new top-level structure.
|
||||
2. **One command to run.** Whatever the project's existing task runner supports — `pnpm <name>`, `python <path>`, `bun <path>`, etc. The user must be able to start it without thinking.
|
||||
3. **No persistence by default.** State lives in memory. Persistence is the thing the prototype is _checking_, not something it should depend on. If the question explicitly involves a database, hit a scratch DB or a local file with a clear "PROTOTYPE — wipe me" name.
|
||||
4. **Skip the polish.** No tests, no error handling beyond what makes the prototype _runnable_, no abstractions. The point is to learn something fast and then delete it.
|
||||
5. **Surface the state.** After every action (logic) or on every variant switch (UI), print or render the full relevant state so the user can see what changed.
|
||||
6. **Delete or absorb when done.** When the prototype has answered its question, either delete it or fold the validated decision into the real code — don't leave it rotting in the repo.
|
||||
|
||||
## When done
|
||||
|
||||
The _answer_ is the only thing worth keeping from a prototype. Capture it somewhere durable (commit message, ADR, issue, or a `NOTES.md` next to the prototype) along with the question it was answering. If the user is around, that capture is a quick conversation; if not, leave the placeholder so they (or you, on the next pass) can fill in the verdict before deleting the prototype.
|
||||
112
.agents/skills/prototype/UI.md
Normal file
112
.agents/skills/prototype/UI.md
Normal file
@@ -0,0 +1,112 @@
|
||||
# UI Prototype
|
||||
|
||||
Generate **several radically different UI variations** on a single route, switchable from a floating bottom bar. The user flips between variants in the browser, picks one (or steals bits from each), then throws the rest away.
|
||||
|
||||
If the question is about logic/state rather than what something looks like — wrong branch. Use [LOGIC.md](LOGIC.md).
|
||||
|
||||
## When this is the right shape
|
||||
|
||||
- "What should this page look like?"
|
||||
- "I want to see a few options for this dashboard before committing."
|
||||
- "Try a different layout for the settings screen."
|
||||
- Any time the user would otherwise spend a day picking between three vague mockups in their head.
|
||||
|
||||
## Two sub-shapes — strongly prefer sub-shape A
|
||||
|
||||
A UI prototype is much easier to judge when it's **butting up against the rest of the app** — real header, real sidebar, real data, real density. A throwaway route on its own is a vacuum: every variant looks fine in isolation. Default to sub-shape A whenever there's a plausible existing page to host the variants. Only reach for sub-shape B if the prototype genuinely has no nearby home.
|
||||
|
||||
### Sub-shape A — adjustment to an existing page (preferred)
|
||||
|
||||
The route already exists. Variants are rendered **on the same route**, gated by a `?variant=` URL search param. The existing data fetching, params, and auth all stay — only the rendering swaps. This is the default; pick it unless there's a specific reason not to.
|
||||
|
||||
If the prototype is for something that doesn't yet have a page but *would naturally live inside one* (a new section of the dashboard, a new card on the settings screen, a new step in an existing flow) — that's still sub-shape A. Mount the variants inside the host page.
|
||||
|
||||
### Sub-shape B — a new page (last resort)
|
||||
|
||||
Only use this when the thing being prototyped genuinely has no existing page to live inside — e.g. an entirely new top-level surface, or a flow that can't be embedded anywhere sensible.
|
||||
|
||||
Create a **throwaway route** following whatever routing convention the project already uses — don't invent a new top-level structure. Name it so it's obviously a prototype (e.g. include the word `prototype` in the path or filename). Same `?variant=` pattern.
|
||||
|
||||
Before committing to sub-shape B, sanity-check: is there really no existing page this could be embedded in? An empty route hides design problems that a populated one would expose.
|
||||
|
||||
In both sub-shapes the floating bottom bar is identical.
|
||||
|
||||
## Process
|
||||
|
||||
### 1. State the question and pick N
|
||||
|
||||
Default to **3 variants**. More than 5 stops being radically different and starts being noise — cap there.
|
||||
|
||||
Write down the plan in one line, in the prototype's location or a top-of-file comment:
|
||||
|
||||
> "Three variants of the settings page, switchable via `?variant=`, on the existing `/settings` route."
|
||||
|
||||
This works whether the user is here to push back or not.
|
||||
|
||||
### 2. Generate radically different variants
|
||||
|
||||
Draft each variant. Hold each one to:
|
||||
|
||||
- The page's purpose and the data it has access to.
|
||||
- The project's component library / styling system (TailwindCSS, shadcn, MUI, plain CSS, whatever).
|
||||
- A clear exported component name, e.g. `VariantA`, `VariantB`, `VariantC`.
|
||||
|
||||
Variants must be **structurally different** — different layout, different information hierarchy, different primary affordance, not just different colours. Three slightly-tweaked card grids isn't a UI prototype, it's wallpaper. If two drafts come out too similar, redo one with explicit "do not use a card grid" guidance.
|
||||
|
||||
### 3. Wire them together
|
||||
|
||||
Create a single switcher component on the route:
|
||||
|
||||
```tsx
|
||||
// pseudo-code — adapt to the project's framework
|
||||
const variant = searchParams.get('variant') ?? 'A';
|
||||
return (
|
||||
<>
|
||||
{variant === 'A' && <VariantA {...data} />}
|
||||
{variant === 'B' && <VariantB {...data} />}
|
||||
{variant === 'C' && <VariantC {...data} />}
|
||||
<PrototypeSwitcher variants={['A','B','C']} current={variant} />
|
||||
</>
|
||||
);
|
||||
```
|
||||
|
||||
For sub-shape A (existing page): keep all the existing data fetching above the switcher; only the rendered subtree changes per variant.
|
||||
|
||||
For sub-shape B (new page): the throwaway route under `/prototype/<name>` mounts the same switcher.
|
||||
|
||||
### 4. Build the floating switcher
|
||||
|
||||
A small fixed-position bar at the bottom-centre of the screen with three pieces:
|
||||
|
||||
- **Left arrow** — cycles to the previous variant (wraps around).
|
||||
- **Variant label** — shows the current variant key and, if the variant exports a name, that name too. e.g. `B — Sidebar layout`.
|
||||
- **Right arrow** — cycles forward (wraps around).
|
||||
|
||||
Behaviour:
|
||||
|
||||
- Clicking an arrow updates the URL search param (use the framework's router — `router.replace` on Next, `navigate` on React Router, etc) so the variant is shareable and reload-stable.
|
||||
- Keyboard: `←` and `→` arrow keys also cycle. Don't intercept arrow keys when an `<input>`, `<textarea>`, or `[contenteditable]` is focused.
|
||||
- Visually distinct from the page (e.g. high-contrast pill, subtle shadow) so it's obviously not part of the design being evaluated.
|
||||
- Hidden in production builds — gate on `process.env.NODE_ENV !== 'production'` or an equivalent check, so a stray prototype merge can't ship the bar to users.
|
||||
|
||||
Put the switcher in a single shared component so both sub-shapes can reuse it. Locate it wherever shared UI lives in the project.
|
||||
|
||||
### 5. Hand it over
|
||||
|
||||
Surface the URL (and the `?variant=` keys). The user will flip through whenever they get to it. The interesting feedback is usually **"I want the header from B with the sidebar from C"** — that's the actual design they want.
|
||||
|
||||
### 6. Capture the answer and clean up
|
||||
|
||||
Once a variant has won, write down which one and why (commit message, ADR, issue, or a `NOTES.md` next to the prototype if running AFK and the user hasn't responded yet). Then:
|
||||
|
||||
- **Sub-shape A** — delete the losing variants and the switcher; fold the winner into the existing page.
|
||||
- **Sub-shape B** — promote the winning variant to a real route, delete the throwaway route and the switcher.
|
||||
|
||||
Don't leave variant components or the switcher lying around. They rot fast and confuse the next reader.
|
||||
|
||||
## Anti-patterns
|
||||
|
||||
- **Variants that differ only in colour or copy.** That's a tweak, not a prototype. Real variants disagree about structure.
|
||||
- **Sharing too much code between variants.** A shared `<Header>` is fine; a shared `<Layout>` defeats the point. Each variant should be free to throw out the layout.
|
||||
- **Wiring variants to real mutations.** Read-only prototypes are fine. If a variant needs to mutate, point it at a stub — the question is "what should this look like", not "does the backend work".
|
||||
- **Promoting the prototype directly to production.** The variant code was written under prototype constraints (no tests, minimal error handling). Rewrite it properly when you fold it in.
|
||||
121
.agents/skills/setup-matt-pocock-skills/SKILL.md
Normal file
121
.agents/skills/setup-matt-pocock-skills/SKILL.md
Normal file
@@ -0,0 +1,121 @@
|
||||
---
|
||||
name: setup-matt-pocock-skills
|
||||
description: Sets up an `## Agent skills` block in AGENTS.md/CLAUDE.md and `docs/agents/` so the engineering skills know this repo's issue tracker (GitHub or local markdown), triage label vocabulary, and domain doc layout. Run before first use of `to-issues`, `to-prd`, `triage`, `diagnose`, `tdd`, `improve-codebase-architecture`, or `zoom-out` — or if those skills appear to be missing context about the issue tracker, triage labels, or domain docs.
|
||||
disable-model-invocation: true
|
||||
---
|
||||
|
||||
# Setup Matt Pocock's Skills
|
||||
|
||||
Scaffold the per-repo configuration that the engineering skills assume:
|
||||
|
||||
- **Issue tracker** — where issues live (GitHub by default; local markdown is also supported out of the box)
|
||||
- **Triage labels** — the strings used for the five canonical triage roles
|
||||
- **Domain docs** — where `CONTEXT.md` and ADRs live, and the consumer rules for reading them
|
||||
|
||||
This is a prompt-driven skill, not a deterministic script. Explore, present what you found, confirm with the user, then write.
|
||||
|
||||
## Process
|
||||
|
||||
### 1. Explore
|
||||
|
||||
Look at the current repo to understand its starting state. Read whatever exists; don't assume:
|
||||
|
||||
- `git remote -v` and `.git/config` — is this a GitHub repo? Which one?
|
||||
- `AGENTS.md` and `CLAUDE.md` at the repo root — does either exist? Is there already an `## Agent skills` section in either?
|
||||
- `CONTEXT.md` and `CONTEXT-MAP.md` at the repo root
|
||||
- `docs/adr/` and any `src/*/docs/adr/` directories
|
||||
- `docs/agents/` — does this skill's prior output already exist?
|
||||
- `.scratch/` — sign that a local-markdown issue tracker convention is already in use
|
||||
|
||||
### 2. Present findings and ask
|
||||
|
||||
Summarise what's present and what's missing. Then walk the user through the three decisions **one at a time** — present a section, get the user's answer, then move to the next. Don't dump all three at once.
|
||||
|
||||
Assume the user does not know what these terms mean. Each section starts with a short explainer (what it is, why these skills need it, what changes if they pick differently). Then show the choices and the default.
|
||||
|
||||
**Section A — Issue tracker.**
|
||||
|
||||
> Explainer: The "issue tracker" is where issues live for this repo. Skills like `to-issues`, `triage`, `to-prd`, and `qa` read from and write to it — they need to know whether to call `gh issue create`, write a markdown file under `.scratch/`, or follow some other workflow you describe. Pick the place you actually track work for this repo.
|
||||
|
||||
Default posture: these skills were designed for GitHub. If a `git remote` points at GitHub, propose that. If a `git remote` points at GitLab (`gitlab.com` or a self-hosted host), propose GitLab. Otherwise (or if the user prefers), offer:
|
||||
|
||||
- **GitHub** — issues live in the repo's GitHub Issues (uses the `gh` CLI)
|
||||
- **GitLab** — issues live in the repo's GitLab Issues (uses the [`glab`](https://gitlab.com/gitlab-org/cli) CLI)
|
||||
- **Local markdown** — issues live as files under `.scratch/<feature>/` in this repo (good for solo projects or repos without a remote)
|
||||
- **Other** (Jira, Linear, etc.) — ask the user to describe the workflow in one paragraph; the skill will record it as freeform prose
|
||||
|
||||
**Section B — Triage label vocabulary.**
|
||||
|
||||
> Explainer: When the `triage` skill processes an incoming issue, it moves it through a state machine — needs evaluation, waiting on reporter, ready for an AFK agent to pick up, ready for a human, or won't fix. To do that, it needs to apply labels (or the equivalent in your issue tracker) that match strings *you've actually configured*. If your repo already uses different label names (e.g. `bug:triage` instead of `needs-triage`), map them here so the skill applies the right ones instead of creating duplicates.
|
||||
|
||||
The five canonical roles:
|
||||
|
||||
- `needs-triage` — maintainer needs to evaluate
|
||||
- `needs-info` — waiting on reporter
|
||||
- `ready-for-agent` — fully specified, AFK-ready (an agent can pick it up with no human context)
|
||||
- `ready-for-human` — needs human implementation
|
||||
- `wontfix` — will not be actioned
|
||||
|
||||
Default: each role's string equals its name. Ask the user if they want to override any. If their issue tracker has no existing labels, the defaults are fine.
|
||||
|
||||
**Section C — Domain docs.**
|
||||
|
||||
> Explainer: Some skills (`improve-codebase-architecture`, `diagnose`, `tdd`) read a `CONTEXT.md` file to learn the project's domain language, and `docs/adr/` for past architectural decisions. They need to know whether the repo has one global context or multiple (e.g. a monorepo with separate frontend/backend contexts) so they look in the right place.
|
||||
|
||||
Confirm the layout:
|
||||
|
||||
- **Single-context** — one `CONTEXT.md` + `docs/adr/` at the repo root. Most repos are this.
|
||||
- **Multi-context** — `CONTEXT-MAP.md` at the root pointing to per-context `CONTEXT.md` files (typically a monorepo).
|
||||
|
||||
### 3. Confirm and edit
|
||||
|
||||
Show the user a draft of:
|
||||
|
||||
- The `## Agent skills` block to add to whichever of `CLAUDE.md` / `AGENTS.md` is being edited (see step 4 for selection rules)
|
||||
- The contents of `docs/agents/issue-tracker.md`, `docs/agents/triage-labels.md`, `docs/agents/domain.md`
|
||||
|
||||
Let them edit before writing.
|
||||
|
||||
### 4. Write
|
||||
|
||||
**Pick the file to edit:**
|
||||
|
||||
- If `CLAUDE.md` exists, edit it.
|
||||
- Else if `AGENTS.md` exists, edit it.
|
||||
- If neither exists, ask the user which one to create — don't pick for them.
|
||||
|
||||
Never create `AGENTS.md` when `CLAUDE.md` already exists (or vice versa) — always edit the one that's already there.
|
||||
|
||||
If an `## Agent skills` block already exists in the chosen file, update its contents in-place rather than appending a duplicate. Don't overwrite user edits to the surrounding sections.
|
||||
|
||||
The block:
|
||||
|
||||
```markdown
|
||||
## Agent skills
|
||||
|
||||
### Issue tracker
|
||||
|
||||
[one-line summary of where issues are tracked]. See `docs/agents/issue-tracker.md`.
|
||||
|
||||
### Triage labels
|
||||
|
||||
[one-line summary of the label vocabulary]. See `docs/agents/triage-labels.md`.
|
||||
|
||||
### Domain docs
|
||||
|
||||
[one-line summary of layout — "single-context" or "multi-context"]. See `docs/agents/domain.md`.
|
||||
```
|
||||
|
||||
Then write the three docs files using the seed templates in this skill folder as a starting point:
|
||||
|
||||
- [issue-tracker-github.md](./issue-tracker-github.md) — GitHub issue tracker
|
||||
- [issue-tracker-gitlab.md](./issue-tracker-gitlab.md) — GitLab issue tracker
|
||||
- [issue-tracker-local.md](./issue-tracker-local.md) — local-markdown issue tracker
|
||||
- [triage-labels.md](./triage-labels.md) — label mapping
|
||||
- [domain.md](./domain.md) — domain doc consumer rules + layout
|
||||
|
||||
For "other" issue trackers, write `docs/agents/issue-tracker.md` from scratch using the user's description.
|
||||
|
||||
### 5. Done
|
||||
|
||||
Tell the user the setup is complete and which engineering skills will now read from these files. Mention they can edit `docs/agents/*.md` directly later — re-running this skill is only necessary if they want to switch issue trackers or restart from scratch.
|
||||
51
.agents/skills/setup-matt-pocock-skills/domain.md
Normal file
51
.agents/skills/setup-matt-pocock-skills/domain.md
Normal file
@@ -0,0 +1,51 @@
|
||||
# Domain Docs
|
||||
|
||||
How the engineering skills should consume this repo's domain documentation when exploring the codebase.
|
||||
|
||||
## Before exploring, read these
|
||||
|
||||
- **`CONTEXT.md`** at the repo root, or
|
||||
- **`CONTEXT-MAP.md`** at the repo root if it exists — it points at one `CONTEXT.md` per context. Read each one relevant to the topic.
|
||||
- **`docs/adr/`** — read ADRs that touch the area you're about to work in. In multi-context repos, also check `src/<context>/docs/adr/` for context-scoped decisions.
|
||||
|
||||
If any of these files don't exist, **proceed silently**. Don't flag their absence; don't suggest creating them upfront. The producer skill (`/grill-with-docs`) creates them lazily when terms or decisions actually get resolved.
|
||||
|
||||
## File structure
|
||||
|
||||
Single-context repo (most repos):
|
||||
|
||||
```
|
||||
/
|
||||
├── CONTEXT.md
|
||||
├── docs/adr/
|
||||
│ ├── 0001-event-sourced-orders.md
|
||||
│ └── 0002-postgres-for-write-model.md
|
||||
└── src/
|
||||
```
|
||||
|
||||
Multi-context repo (presence of `CONTEXT-MAP.md` at the root):
|
||||
|
||||
```
|
||||
/
|
||||
├── CONTEXT-MAP.md
|
||||
├── docs/adr/ ← system-wide decisions
|
||||
└── src/
|
||||
├── ordering/
|
||||
│ ├── CONTEXT.md
|
||||
│ └── docs/adr/ ← context-specific decisions
|
||||
└── billing/
|
||||
├── CONTEXT.md
|
||||
└── docs/adr/
|
||||
```
|
||||
|
||||
## Use the glossary's vocabulary
|
||||
|
||||
When your output names a domain concept (in an issue title, a refactor proposal, a hypothesis, a test name), use the term as defined in `CONTEXT.md`. Don't drift to synonyms the glossary explicitly avoids.
|
||||
|
||||
If the concept you need isn't in the glossary yet, that's a signal — either you're inventing language the project doesn't use (reconsider) or there's a real gap (note it for `/grill-with-docs`).
|
||||
|
||||
## Flag ADR conflicts
|
||||
|
||||
If your output contradicts an existing ADR, surface it explicitly rather than silently overriding:
|
||||
|
||||
> _Contradicts ADR-0007 (event-sourced orders) — but worth reopening because…_
|
||||
@@ -0,0 +1,22 @@
|
||||
# Issue tracker: GitHub
|
||||
|
||||
Issues and PRDs for this repo live as GitHub issues. Use the `gh` CLI for all operations.
|
||||
|
||||
## Conventions
|
||||
|
||||
- **Create an issue**: `gh issue create --title "..." --body "..."`. Use a heredoc for multi-line bodies.
|
||||
- **Read an issue**: `gh issue view <number> --comments`, filtering comments by `jq` and also fetching labels.
|
||||
- **List issues**: `gh issue list --state open --json number,title,body,labels,comments --jq '[.[] | {number, title, body, labels: [.labels[].name], comments: [.comments[].body]}]'` with appropriate `--label` and `--state` filters.
|
||||
- **Comment on an issue**: `gh issue comment <number> --body "..."`
|
||||
- **Apply / remove labels**: `gh issue edit <number> --add-label "..."` / `--remove-label "..."`
|
||||
- **Close**: `gh issue close <number> --comment "..."`
|
||||
|
||||
Infer the repo from `git remote -v` — `gh` does this automatically when run inside a clone.
|
||||
|
||||
## When a skill says "publish to the issue tracker"
|
||||
|
||||
Create a GitHub issue.
|
||||
|
||||
## When a skill says "fetch the relevant ticket"
|
||||
|
||||
Run `gh issue view <number> --comments`.
|
||||
@@ -0,0 +1,23 @@
|
||||
# Issue tracker: GitLab
|
||||
|
||||
Issues and PRDs for this repo live as GitLab issues. Use the [`glab`](https://gitlab.com/gitlab-org/cli) CLI for all operations.
|
||||
|
||||
## Conventions
|
||||
|
||||
- **Create an issue**: `glab issue create --title "..." --description "..."`. Use a heredoc for multi-line descriptions. Pass `--description -` to open an editor.
|
||||
- **Read an issue**: `glab issue view <number> --comments`. Use `-F json` for machine-readable output.
|
||||
- **List issues**: `glab issue list -F json` with appropriate `--label` filters.
|
||||
- **Comment on an issue**: `glab issue note <number> --message "..."`. GitLab calls comments "notes".
|
||||
- **Apply / remove labels**: `glab issue update <number> --label "..."` / `--unlabel "..."`. Multiple labels can be comma-separated or by repeating the flag.
|
||||
- **Close**: `glab issue close <number>`. `glab issue close` does not accept a closing comment, so post the explanation first with `glab issue note <number> --message "..."`, then close.
|
||||
- **Merge requests**: GitLab calls PRs "merge requests". Use `glab mr create`, `glab mr view`, `glab mr note`, etc. — the same shape as `gh pr ...` with `mr` in place of `pr` and `note`/`--message` in place of `comment`/`--body`.
|
||||
|
||||
Infer the repo from `git remote -v` — `glab` does this automatically when run inside a clone.
|
||||
|
||||
## When a skill says "publish to the issue tracker"
|
||||
|
||||
Create a GitLab issue.
|
||||
|
||||
## When a skill says "fetch the relevant ticket"
|
||||
|
||||
Run `glab issue view <number> --comments`.
|
||||
@@ -0,0 +1,19 @@
|
||||
# Issue tracker: Local Markdown
|
||||
|
||||
Issues and PRDs for this repo live as markdown files in `.scratch/`.
|
||||
|
||||
## Conventions
|
||||
|
||||
- One feature per directory: `.scratch/<feature-slug>/`
|
||||
- The PRD is `.scratch/<feature-slug>/PRD.md`
|
||||
- Implementation issues are `.scratch/<feature-slug>/issues/<NN>-<slug>.md`, numbered from `01`
|
||||
- Triage state is recorded as a `Status:` line near the top of each issue file (see `triage-labels.md` for the role strings)
|
||||
- Comments and conversation history append to the bottom of the file under a `## Comments` heading
|
||||
|
||||
## When a skill says "publish to the issue tracker"
|
||||
|
||||
Create a new file under `.scratch/<feature-slug>/` (creating the directory if needed).
|
||||
|
||||
## When a skill says "fetch the relevant ticket"
|
||||
|
||||
Read the file at the referenced path. The user will normally pass the path or the issue number directly.
|
||||
15
.agents/skills/setup-matt-pocock-skills/triage-labels.md
Normal file
15
.agents/skills/setup-matt-pocock-skills/triage-labels.md
Normal file
@@ -0,0 +1,15 @@
|
||||
# Triage Labels
|
||||
|
||||
The skills speak in terms of five canonical triage roles. This file maps those roles to the actual label strings used in this repo's issue tracker.
|
||||
|
||||
| Label in mattpocock/skills | Label in our tracker | Meaning |
|
||||
| -------------------------- | -------------------- | ---------------------------------------- |
|
||||
| `needs-triage` | `needs-triage` | Maintainer needs to evaluate this issue |
|
||||
| `needs-info` | `needs-info` | Waiting on reporter for more information |
|
||||
| `ready-for-agent` | `ready-for-agent` | Fully specified, ready for an AFK agent |
|
||||
| `ready-for-human` | `ready-for-human` | Requires human implementation |
|
||||
| `wontfix` | `wontfix` | Will not be actioned |
|
||||
|
||||
When a skill mentions a role (e.g. "apply the AFK-ready triage label"), use the corresponding label string from this table.
|
||||
|
||||
Edit the right-hand column to match whatever vocabulary you actually use.
|
||||
109
.agents/skills/tdd/SKILL.md
Normal file
109
.agents/skills/tdd/SKILL.md
Normal file
@@ -0,0 +1,109 @@
|
||||
---
|
||||
name: tdd
|
||||
description: Test-driven development with red-green-refactor loop. Use when user wants to build features or fix bugs using TDD, mentions "red-green-refactor", wants integration tests, or asks for test-first development.
|
||||
---
|
||||
|
||||
# Test-Driven Development
|
||||
|
||||
## Philosophy
|
||||
|
||||
**Core principle**: Tests should verify behavior through public interfaces, not implementation details. Code can change entirely; tests shouldn't.
|
||||
|
||||
**Good tests** are integration-style: they exercise real code paths through public APIs. They describe _what_ the system does, not _how_ it does it. A good test reads like a specification - "user can checkout with valid cart" tells you exactly what capability exists. These tests survive refactors because they don't care about internal structure.
|
||||
|
||||
**Bad tests** are coupled to implementation. They mock internal collaborators, test private methods, or verify through external means (like querying a database directly instead of using the interface). The warning sign: your test breaks when you refactor, but behavior hasn't changed. If you rename an internal function and tests fail, those tests were testing implementation, not behavior.
|
||||
|
||||
See [tests.md](tests.md) for examples and [mocking.md](mocking.md) for mocking guidelines.
|
||||
|
||||
## Anti-Pattern: Horizontal Slices
|
||||
|
||||
**DO NOT write all tests first, then all implementation.** This is "horizontal slicing" - treating RED as "write all tests" and GREEN as "write all code."
|
||||
|
||||
This produces **crap tests**:
|
||||
|
||||
- Tests written in bulk test _imagined_ behavior, not _actual_ behavior
|
||||
- You end up testing the _shape_ of things (data structures, function signatures) rather than user-facing behavior
|
||||
- Tests become insensitive to real changes - they pass when behavior breaks, fail when behavior is fine
|
||||
- You outrun your headlights, committing to test structure before understanding the implementation
|
||||
|
||||
**Correct approach**: Vertical slices via tracer bullets. One test → one implementation → repeat. Each test responds to what you learned from the previous cycle. Because you just wrote the code, you know exactly what behavior matters and how to verify it.
|
||||
|
||||
```
|
||||
WRONG (horizontal):
|
||||
RED: test1, test2, test3, test4, test5
|
||||
GREEN: impl1, impl2, impl3, impl4, impl5
|
||||
|
||||
RIGHT (vertical):
|
||||
RED→GREEN: test1→impl1
|
||||
RED→GREEN: test2→impl2
|
||||
RED→GREEN: test3→impl3
|
||||
...
|
||||
```
|
||||
|
||||
## Workflow
|
||||
|
||||
### 1. Planning
|
||||
|
||||
When exploring the codebase, use the project's domain glossary so that test names and interface vocabulary match the project's language, and respect ADRs in the area you're touching.
|
||||
|
||||
Before writing any code:
|
||||
|
||||
- [ ] Confirm with user what interface changes are needed
|
||||
- [ ] Confirm with user which behaviors to test (prioritize)
|
||||
- [ ] Identify opportunities for [deep modules](deep-modules.md) (small interface, deep implementation)
|
||||
- [ ] Design interfaces for [testability](interface-design.md)
|
||||
- [ ] List the behaviors to test (not implementation steps)
|
||||
- [ ] Get user approval on the plan
|
||||
|
||||
Ask: "What should the public interface look like? Which behaviors are most important to test?"
|
||||
|
||||
**You can't test everything.** Confirm with the user exactly which behaviors matter most. Focus testing effort on critical paths and complex logic, not every possible edge case.
|
||||
|
||||
### 2. Tracer Bullet
|
||||
|
||||
Write ONE test that confirms ONE thing about the system:
|
||||
|
||||
```
|
||||
RED: Write test for first behavior → test fails
|
||||
GREEN: Write minimal code to pass → test passes
|
||||
```
|
||||
|
||||
This is your tracer bullet - proves the path works end-to-end.
|
||||
|
||||
### 3. Incremental Loop
|
||||
|
||||
For each remaining behavior:
|
||||
|
||||
```
|
||||
RED: Write next test → fails
|
||||
GREEN: Minimal code to pass → passes
|
||||
```
|
||||
|
||||
Rules:
|
||||
|
||||
- One test at a time
|
||||
- Only enough code to pass current test
|
||||
- Don't anticipate future tests
|
||||
- Keep tests focused on observable behavior
|
||||
|
||||
### 4. Refactor
|
||||
|
||||
After all tests pass, look for [refactor candidates](refactoring.md):
|
||||
|
||||
- [ ] Extract duplication
|
||||
- [ ] Deepen modules (move complexity behind simple interfaces)
|
||||
- [ ] Apply SOLID principles where natural
|
||||
- [ ] Consider what new code reveals about existing code
|
||||
- [ ] Run tests after each refactor step
|
||||
|
||||
**Never refactor while RED.** Get to GREEN first.
|
||||
|
||||
## Checklist Per Cycle
|
||||
|
||||
```
|
||||
[ ] Test describes behavior, not implementation
|
||||
[ ] Test uses public interface only
|
||||
[ ] Test would survive internal refactor
|
||||
[ ] Code is minimal for this test
|
||||
[ ] No speculative features added
|
||||
```
|
||||
33
.agents/skills/tdd/deep-modules.md
Normal file
33
.agents/skills/tdd/deep-modules.md
Normal file
@@ -0,0 +1,33 @@
|
||||
# Deep Modules
|
||||
|
||||
From "A Philosophy of Software Design":
|
||||
|
||||
**Deep module** = small interface + lots of implementation
|
||||
|
||||
```
|
||||
┌─────────────────────┐
|
||||
│ Small Interface │ ← Few methods, simple params
|
||||
├─────────────────────┤
|
||||
│ │
|
||||
│ │
|
||||
│ Deep Implementation│ ← Complex logic hidden
|
||||
│ │
|
||||
│ │
|
||||
└─────────────────────┘
|
||||
```
|
||||
|
||||
**Shallow module** = large interface + little implementation (avoid)
|
||||
|
||||
```
|
||||
┌─────────────────────────────────┐
|
||||
│ Large Interface │ ← Many methods, complex params
|
||||
├─────────────────────────────────┤
|
||||
│ Thin Implementation │ ← Just passes through
|
||||
└─────────────────────────────────┘
|
||||
```
|
||||
|
||||
When designing interfaces, ask:
|
||||
|
||||
- Can I reduce the number of methods?
|
||||
- Can I simplify the parameters?
|
||||
- Can I hide more complexity inside?
|
||||
31
.agents/skills/tdd/interface-design.md
Normal file
31
.agents/skills/tdd/interface-design.md
Normal file
@@ -0,0 +1,31 @@
|
||||
# Interface Design for Testability
|
||||
|
||||
Good interfaces make testing natural:
|
||||
|
||||
1. **Accept dependencies, don't create them**
|
||||
|
||||
```typescript
|
||||
// Testable
|
||||
function processOrder(order, paymentGateway) {}
|
||||
|
||||
// Hard to test
|
||||
function processOrder(order) {
|
||||
const gateway = new StripeGateway();
|
||||
}
|
||||
```
|
||||
|
||||
2. **Return results, don't produce side effects**
|
||||
|
||||
```typescript
|
||||
// Testable
|
||||
function calculateDiscount(cart): Discount {}
|
||||
|
||||
// Hard to test
|
||||
function applyDiscount(cart): void {
|
||||
cart.total -= discount;
|
||||
}
|
||||
```
|
||||
|
||||
3. **Small surface area**
|
||||
- Fewer methods = fewer tests needed
|
||||
- Fewer params = simpler test setup
|
||||
59
.agents/skills/tdd/mocking.md
Normal file
59
.agents/skills/tdd/mocking.md
Normal file
@@ -0,0 +1,59 @@
|
||||
# When to Mock
|
||||
|
||||
Mock at **system boundaries** only:
|
||||
|
||||
- External APIs (payment, email, etc.)
|
||||
- Databases (sometimes - prefer test DB)
|
||||
- Time/randomness
|
||||
- File system (sometimes)
|
||||
|
||||
Don't mock:
|
||||
|
||||
- Your own classes/modules
|
||||
- Internal collaborators
|
||||
- Anything you control
|
||||
|
||||
## Designing for Mockability
|
||||
|
||||
At system boundaries, design interfaces that are easy to mock:
|
||||
|
||||
**1. Use dependency injection**
|
||||
|
||||
Pass external dependencies in rather than creating them internally:
|
||||
|
||||
```typescript
|
||||
// Easy to mock
|
||||
function processPayment(order, paymentClient) {
|
||||
return paymentClient.charge(order.total);
|
||||
}
|
||||
|
||||
// Hard to mock
|
||||
function processPayment(order) {
|
||||
const client = new StripeClient(process.env.STRIPE_KEY);
|
||||
return client.charge(order.total);
|
||||
}
|
||||
```
|
||||
|
||||
**2. Prefer SDK-style interfaces over generic fetchers**
|
||||
|
||||
Create specific functions for each external operation instead of one generic function with conditional logic:
|
||||
|
||||
```typescript
|
||||
// GOOD: Each function is independently mockable
|
||||
const api = {
|
||||
getUser: (id) => fetch(`/users/${id}`),
|
||||
getOrders: (userId) => fetch(`/users/${userId}/orders`),
|
||||
createOrder: (data) => fetch('/orders', { method: 'POST', body: data }),
|
||||
};
|
||||
|
||||
// BAD: Mocking requires conditional logic inside the mock
|
||||
const api = {
|
||||
fetch: (endpoint, options) => fetch(endpoint, options),
|
||||
};
|
||||
```
|
||||
|
||||
The SDK approach means:
|
||||
- Each mock returns one specific shape
|
||||
- No conditional logic in test setup
|
||||
- Easier to see which endpoints a test exercises
|
||||
- Type safety per endpoint
|
||||
10
.agents/skills/tdd/refactoring.md
Normal file
10
.agents/skills/tdd/refactoring.md
Normal file
@@ -0,0 +1,10 @@
|
||||
# Refactor Candidates
|
||||
|
||||
After TDD cycle, look for:
|
||||
|
||||
- **Duplication** → Extract function/class
|
||||
- **Long methods** → Break into private helpers (keep tests on public interface)
|
||||
- **Shallow modules** → Combine or deepen
|
||||
- **Feature envy** → Move logic to where data lives
|
||||
- **Primitive obsession** → Introduce value objects
|
||||
- **Existing code** the new code reveals as problematic
|
||||
61
.agents/skills/tdd/tests.md
Normal file
61
.agents/skills/tdd/tests.md
Normal file
@@ -0,0 +1,61 @@
|
||||
# Good and Bad Tests
|
||||
|
||||
## Good Tests
|
||||
|
||||
**Integration-style**: Test through real interfaces, not mocks of internal parts.
|
||||
|
||||
```typescript
|
||||
// GOOD: Tests observable behavior
|
||||
test("user can checkout with valid cart", async () => {
|
||||
const cart = createCart();
|
||||
cart.add(product);
|
||||
const result = await checkout(cart, paymentMethod);
|
||||
expect(result.status).toBe("confirmed");
|
||||
});
|
||||
```
|
||||
|
||||
Characteristics:
|
||||
|
||||
- Tests behavior users/callers care about
|
||||
- Uses public API only
|
||||
- Survives internal refactors
|
||||
- Describes WHAT, not HOW
|
||||
- One logical assertion per test
|
||||
|
||||
## Bad Tests
|
||||
|
||||
**Implementation-detail tests**: Coupled to internal structure.
|
||||
|
||||
```typescript
|
||||
// BAD: Tests implementation details
|
||||
test("checkout calls paymentService.process", async () => {
|
||||
const mockPayment = jest.mock(paymentService);
|
||||
await checkout(cart, payment);
|
||||
expect(mockPayment.process).toHaveBeenCalledWith(cart.total);
|
||||
});
|
||||
```
|
||||
|
||||
Red flags:
|
||||
|
||||
- Mocking internal collaborators
|
||||
- Testing private methods
|
||||
- Asserting on call counts/order
|
||||
- Test breaks when refactoring without behavior change
|
||||
- Test name describes HOW not WHAT
|
||||
- Verifying through external means instead of interface
|
||||
|
||||
```typescript
|
||||
// BAD: Bypasses interface to verify
|
||||
test("createUser saves to database", async () => {
|
||||
await createUser({ name: "Alice" });
|
||||
const row = await db.query("SELECT * FROM users WHERE name = ?", ["Alice"]);
|
||||
expect(row).toBeDefined();
|
||||
});
|
||||
|
||||
// GOOD: Verifies through interface
|
||||
test("createUser makes user retrievable", async () => {
|
||||
const user = await createUser({ name: "Alice" });
|
||||
const retrieved = await getUser(user.id);
|
||||
expect(retrieved.name).toBe("Alice");
|
||||
});
|
||||
```
|
||||
35
.agents/skills/teach/GLOSSARY-FORMAT.md
Normal file
35
.agents/skills/teach/GLOSSARY-FORMAT.md
Normal file
@@ -0,0 +1,35 @@
|
||||
# GLOSSARY.md Format
|
||||
|
||||
`GLOSSARY.md` is the canonical language for this teaching workspace. All explainers, exercises, and learning records should adhere to its terminology. Building it is itself part of learning: compressing a concept into a tight definition is evidence the user understands it.
|
||||
|
||||
## Structure
|
||||
|
||||
```md
|
||||
# {Topic} Glossary
|
||||
|
||||
{One or two sentence description of the topic this glossary covers.}
|
||||
|
||||
## Terms
|
||||
|
||||
**Hypertrophy**:
|
||||
Muscle growth driven by mechanical tension and metabolic stress over repeated training sessions.
|
||||
_Avoid_: Bulking, getting big
|
||||
|
||||
**Progressive overload**:
|
||||
Systematically increasing the demand on a muscle over time — via load, volume, or intensity.
|
||||
_Avoid_: Pushing harder, levelling up
|
||||
|
||||
**RPE (Rate of Perceived Exertion)**:
|
||||
A 1–10 self-rating of how hard a set felt, where 10 is failure and 8 means two reps left in the tank.
|
||||
_Avoid_: Effort score, intensity rating
|
||||
```
|
||||
|
||||
## Rules
|
||||
|
||||
- **Add a term only when the user understands it.** The glossary is a record of compressed knowledge, not a dictionary the user reads to learn. If the user has just been introduced to a concept, wait until they can use it correctly before promoting it here.
|
||||
- **Be opinionated.** When several words exist for the same concept, pick the best one and list the rest as aliases to avoid. This is how language compresses.
|
||||
- **Keep definitions tight.** One or two sentences. Define what the term IS, not what it does or how to do it.
|
||||
- **Use the glossary's own terms inside definitions.** Once a term is in the glossary, prefer it everywhere — including inside other definitions. This is what makes complex terms easier to grasp later.
|
||||
- **Group under subheadings** when natural clusters emerge (e.g. `## Anatomy`, `## Programming`). A flat list is fine when terms cohere.
|
||||
- **Flag ambiguities explicitly.** If a term is used loosely in the wider field, note the resolution: "In this workspace, 'set' always means a working set — warm-ups are tracked separately."
|
||||
- **Revise as understanding deepens.** A definition the user wrote in week one may be wrong by week six. Update in place; do not leave stale entries.
|
||||
46
.agents/skills/teach/LEARNING-RECORD-FORMAT.md
Normal file
46
.agents/skills/teach/LEARNING-RECORD-FORMAT.md
Normal file
@@ -0,0 +1,46 @@
|
||||
# Learning Record Format
|
||||
|
||||
Learning records live in `./learning-records/` and use sequential numbering: `0001-slug.md`, `0002-slug.md`, etc. Create the directory lazily — only when the first record is written.
|
||||
|
||||
They are the teaching equivalent of ADRs: they capture non-obvious lessons, key insights, and stated prior knowledge that will steer future sessions. They are used to calculate the zone of proximal development.
|
||||
|
||||
## Template
|
||||
|
||||
```md
|
||||
# {Short title of what was learned or established}
|
||||
|
||||
{1-3 sentences: what was learned (or what prior knowledge was established), and why it matters for future sessions.}
|
||||
```
|
||||
|
||||
That is the whole format. A learning record can be a single paragraph. The value is recording _that_ this is now known and _why_ it changes what to teach next — not in filling out sections.
|
||||
|
||||
## Optional sections
|
||||
|
||||
Only include these when they add genuine value. Most records won't need them.
|
||||
|
||||
- **Status** frontmatter (`active | superseded by LR-NNNN`) — useful when an earlier understanding turns out to be wrong and is replaced.
|
||||
- **Evidence** — how the user demonstrated the understanding (a question answered, an exercise completed, prior experience cited). Useful when the claim might be revisited.
|
||||
- **Implications** — what this unlocks or rules out for future sessions. Worth recording when non-obvious.
|
||||
|
||||
## Numbering
|
||||
|
||||
Scan `./learning-records/` for the highest existing number and increment by one.
|
||||
|
||||
## When to write a learning record
|
||||
|
||||
Write one when any of these is true:
|
||||
|
||||
1. **The user demonstrated genuine understanding of something non-trivial** — not just exposure, but evidence they can use the concept correctly. This sets a new floor for what to teach next.
|
||||
2. **The user disclosed prior knowledge** — "I already know X." Record it so future sessions don't re-teach it. Also record the _depth_ claimed.
|
||||
3. **A misconception was corrected** — the user previously believed something wrong and now sees why. These are high-value: they predict future stumbling blocks for related topics.
|
||||
4. **The mission shifted in response to learning** — the user discovered they cared about something different than they thought. Cross-link to [[MISSION.md]] and update it.
|
||||
|
||||
### What does _not_ qualify
|
||||
|
||||
- Material that was merely covered. Coverage is not learning. Wait for evidence.
|
||||
- Anything already captured tersely in [[GLOSSARY.md]] as a term definition. Don't duplicate.
|
||||
- Session-by-session activity logs. Learning records are not a journal — they are decision-grade insights.
|
||||
|
||||
## Supersession
|
||||
|
||||
When a later record contradicts an earlier one (the user's understanding deepened or corrected), mark the old record `Status: superseded by LR-NNNN` rather than deleting it. The history of how understanding evolved is itself useful signal.
|
||||
31
.agents/skills/teach/MISSION-FORMAT.md
Normal file
31
.agents/skills/teach/MISSION-FORMAT.md
Normal file
@@ -0,0 +1,31 @@
|
||||
# MISSION.md Format
|
||||
|
||||
`MISSION.md` lives at the workspace root. It captures the _reason_ the user is learning this topic. Every teaching decision — what to teach next, which resources to surface, which exercises to design — should trace back to this document.
|
||||
|
||||
## Template
|
||||
|
||||
```md
|
||||
# Mission: {Topic}
|
||||
|
||||
## Why
|
||||
{1-3 sentences. The concrete real-world goal the user is chasing. What changes in their life or work when they have this skill? Avoid abstract framings like "to understand X" — push for the underlying outcome.}
|
||||
|
||||
## Success looks like
|
||||
- {A specific, observable thing the user will be able to do}
|
||||
- {Another specific thing}
|
||||
- {…}
|
||||
|
||||
## Constraints
|
||||
- {Time, budget, prior commitments, learning preferences, anything that bounds the approach}
|
||||
|
||||
## Out of scope
|
||||
- {Adjacent topics the user explicitly does not want to chase right now — protects the zone of proximal development}
|
||||
```
|
||||
|
||||
## Rules
|
||||
|
||||
- **One mission per workspace.** If the user wants to learn two unrelated things, that is two workspaces.
|
||||
- **Concrete over abstract.** "Run a half marathon by October" beats "get fitter." "Ship a Rust CLI to my team" beats "learn Rust."
|
||||
- **Push back on vagueness.** If the user cannot articulate why, interview them before writing anything. A bad mission is worse than no mission.
|
||||
- **Revise when reality shifts.** Missions change. When the user's goal moves, update this file — don't leave a stale mission steering future sessions.
|
||||
- **Keep it short.** If `MISSION.md` runs past a screen, it has stopped being a compass and started being a plan.
|
||||
32
.agents/skills/teach/RESOURCES-FORMAT.md
Normal file
32
.agents/skills/teach/RESOURCES-FORMAT.md
Normal file
@@ -0,0 +1,32 @@
|
||||
# RESOURCES.md Format
|
||||
|
||||
`RESOURCES.md` is the curated set of trusted sources for this topic. Knowledge for explainers should be drawn from here, not from parametric guesses. Wisdom comes from the communities listed here.
|
||||
|
||||
## Structure
|
||||
|
||||
```md
|
||||
# {Topic} Resources
|
||||
|
||||
## Knowledge
|
||||
|
||||
- [Book: _The Science and Practice of Strength Training_ — Zatsiorsky & Kraemer](https://example.com)
|
||||
Foundational text on programming and adaptation. Use for: anything to do with periodisation, recovery, intensity zones.
|
||||
- [Article: "How Much Should I Train?" — Greg Nuckols (Stronger By Science)](https://example.com)
|
||||
Evidence-based review of volume landmarks. Use for: weekly set targets per muscle group.
|
||||
|
||||
## Wisdom (Communities)
|
||||
|
||||
- [r/weightroom](https://reddit.com/r/weightroom)
|
||||
High-signal subreddit, moderated against bro-science. Use for: programme critique, plateau troubleshooting.
|
||||
- Local: Tuesday strength class at {gym name}
|
||||
Use for: real-time coaching feedback on lifts.
|
||||
```
|
||||
|
||||
## Rules
|
||||
|
||||
- **High-trust only.** Prefer primary sources, recognised experts, peer-reviewed work, and communities with strong moderation. If a resource is marketing dressed as education, leave it out.
|
||||
- **Annotate every entry.** A bare link is useless in three months. Add one line: what it covers and when to reach for it.
|
||||
- **Group by Knowledge / Wisdom.** Mirrors the philosophy in [SKILL.md](./SKILL.md). It is fine for a resource to appear in only one group.
|
||||
- **Surface gaps explicitly.** If no good resource exists for an area the mission needs, write a `## Gaps` section listing what is missing. This drives future search.
|
||||
- **Prune ruthlessly.** A resource that turned out to be wrong, shallow, or off-mission should be removed, not buried. Better five sharp sources than thirty mediocre ones.
|
||||
- **Record community preferences.** If the user has opted out of joining communities, note it here so future sessions don't keep proposing them.
|
||||
131
.agents/skills/teach/SKILL.md
Normal file
131
.agents/skills/teach/SKILL.md
Normal file
@@ -0,0 +1,131 @@
|
||||
---
|
||||
name: teach
|
||||
description: Teach the user a new skill or concept, within this workspace.
|
||||
disable-model-invocation: true
|
||||
argument-hint: "What would you like to learn about?"
|
||||
---
|
||||
|
||||
The user has asked you to teach them something. This is a stateful request - they intend to learn the topic over multiple sessions.
|
||||
|
||||
## Teaching Workspace
|
||||
|
||||
Treat the current directory as a teaching workspace. The state of their learning is captured in this directory in several files:
|
||||
|
||||
- `MISSION.md`: A document capturing the _reason_ the user is interested in the topic. This should be used to ground all teaching. Use the format in [MISSION-FORMAT.md](./MISSION-FORMAT.md).
|
||||
- `./reference/*.html`: A directory of reference materials. These are the compressed learnings from the lessons - cheat sheets, reference algorithms, syntax, yoga poses, glossaries. They are the raw units of learning. They should be beautiful documents which print out well, and are designed for quick reference.
|
||||
- `RESOURCES.md`: A list of resources which can be explored to ground your teaching in contextual knowledge, or to acquire knowledge and wisdom. Use the format in [RESOURCES-FORMAT.md](./RESOURCES-FORMAT.md).
|
||||
- `./learning-records/*.md`: A directory of learning records, which capture what the user has learned. These are loosely equivalent to architectural decision records in software development - they capture non-obvious lessons and key insights that may need to be revised later, or drive future sessions. These should be used to calculate the zone of proximal development. They are titled `0001-<dash-case-name>.md`, where the number increments each time. Use the format in [LEARNING-RECORD-FORMAT.md](./LEARNING-RECORD-FORMAT.md).
|
||||
- `./lessons/*.html`: A directory of lessons. A **lesson** is a single, self-contained HTML output that teaches one tightly-scoped thing tied to the mission. This is the primary unit of teaching in this workspace.
|
||||
- `NOTES.md`: A scratchpad for you to jot down user preferences, or working notes.
|
||||
|
||||
## Philosophy
|
||||
|
||||
To learn at a deep level, the user needs three things:
|
||||
|
||||
- **Knowledge**, captured from high-quality, high-trust resources
|
||||
- **Skills**, acquired through highly-relevant interactive lessons devised by you, based on the knowledge
|
||||
- **Wisdom**, which comes from interacting with other learners and practitioners
|
||||
|
||||
Before the `RESOURCES.md` is well-populated, your focus should be to find high-quality resources which will help the user acquire knowledge. Never trust your parametric knowledge.
|
||||
|
||||
Some topics may require more skills than knowledge. Learning more about theoretical physics might be more knowledge-based. For yoga, more skills-based.
|
||||
|
||||
### Fluency vs Storage Strength
|
||||
|
||||
You should be careful to split between two types of learning:
|
||||
|
||||
- **Fluency strength**: in-the-moment retrieval of knowledge
|
||||
- **Storage strength**: long-term retention of knowledge
|
||||
|
||||
Fluency can give the user an illusory sense of mastery, but storage strength is the real goal. Try to design lessons which build long-term retention by desirable difficulty:
|
||||
|
||||
- Using retrieval practice (recall from memory)
|
||||
- Spacing (distributing practice over time)
|
||||
- Interleaving (mixing up different but related topics in practice - for skills practice only)
|
||||
|
||||
## Lessons
|
||||
|
||||
A lesson is the main thing you produce — the unit in which knowledge and skills reach the user. Each lesson is one self-contained HTML file, saved to `./lessons/` and titled `0001-<dash-case-name>.html` where the number increments each time.
|
||||
|
||||
A lesson should be **beautiful** — clean, readable typography and layout — since the user will return to these later to review. Think Tufte.
|
||||
|
||||
The lesson should be short, and completable very quickly. Learners' working memory is very small, and we need to stay within it. But each lesson should give the user a single tangible win that they can build on. It should be directly tied to the mission, and should be in the user's zone of proximal development.
|
||||
|
||||
If possible, open the lesson file for the user by running a CLI command.
|
||||
|
||||
Each lesson should link via HTML anchors to other lessons and reference documents.
|
||||
|
||||
Each lesson should recommend a primary source for the user to read or watch. This should be the most high-quality, high-trust resource you found on the topic.
|
||||
|
||||
Each lesson should contain a reminder to ask followup questions to the agent. The agent is their teacher, and can assist with anything that's unclear.
|
||||
|
||||
## The Mission
|
||||
|
||||
Every lesson should be tied into the mission - the reason that the user is interested in learning about the topic.
|
||||
|
||||
If the user is unclear about the mission, or the `MISSION.md` is not populated, your first job should be to question the user on why they want to learn this.
|
||||
|
||||
Failing to understand the mission will mean knowledge acquisition is not grounded in real-world goals. Lessons will feel too abstract. You will have no way of judging what the user should do next.
|
||||
|
||||
Missions may change as the user develops more skills and knowledge. This is normal - make sure to update the `MISSION.md` and add a learning record to capture the change. Confirm with the user before changing the mission.
|
||||
|
||||
## Zone Of Proximal Development
|
||||
|
||||
Each lesson, the user should always feel as if they are being challenged 'just enough'.
|
||||
|
||||
The user may specify an exact thing they want to learn. If they don't, figure out their zone of proximal development by:
|
||||
|
||||
- Reading their `learning-records`
|
||||
- Figuring out the right thing to teach them based on their mission
|
||||
- Teach the most relevant thing that fits in their zone of proximal development
|
||||
|
||||
## Knowledge
|
||||
|
||||
Lessons should be designed around a skill the user is going to learn. The knowledge in the lesson should be only what's required to acquire that skill. You teach the knowledge first, then get the user to practice the skills via an interactive feedback loop.
|
||||
|
||||
Knowledge should first be gathered from trusted resources. Use `RESOURCES.md` to keep track of them. Lessons should be littered with citations - links to external resources to back up any claim made. This increases the trustworthiness of the lesson.
|
||||
|
||||
For acquiring knowledge, difficulty is the enemy. It eats working memory you need for understanding.
|
||||
|
||||
## Skills
|
||||
|
||||
If knowledge is all about acquisition, skills are about durability and flexibility. Make the knowledge stick.
|
||||
|
||||
For skill acquisition, difficulty is the tool. Effortful retrieval is what builds storage strength. Skills should be taught through interactive lessons. There are several tools at your disposal:
|
||||
|
||||
- Interactive lessons, using quizzes and light in-browser tasks
|
||||
- Lessons which guide the user through a list of real-world steps to take (for instance, yoga poses)
|
||||
|
||||
Each of these should be based on a **feedback loop**, where the user receives feedback on their performance. This feedback loop should be as tight as possible, giving feedback immediately - and ideally automatically.
|
||||
|
||||
For quizzes, each answer should be exactly the same number of words (and characters, if possible). Don't give the user any clues about the answer through formatting.
|
||||
|
||||
## Acquiring Wisdom
|
||||
|
||||
Wisdom comes from true real-world interaction - testing your skills outside the learning environment.
|
||||
|
||||
When the user asks a question that appears to require wisdom, your default posture should be to attempt to answer - but to ultimately delegate to a **community**.
|
||||
|
||||
A community is a place (online or offline) where the user can test their skills in the real world. This might be a forum, a subreddit, a real-world class (budget permitting) or a local interest group.
|
||||
|
||||
You should attempt to find high-reputation communities the user can join. If the user expresses a preference that they don't want to join a community, respect it.
|
||||
|
||||
## Reference Documents
|
||||
|
||||
While creating lessons, you should also create reference documents. Lessons can reference these documents - they are useful for tracking raw units of knowledge useful across lessons.
|
||||
|
||||
Lessons will rarely be revisited later - reference documents will be. They should be the compressed essence of the lesson, in a format designed for quick reference.
|
||||
|
||||
Some learning topics lend themselves to reference:
|
||||
|
||||
- Syntax and code snippets for programming
|
||||
- Algorithms and flowcharts for processes
|
||||
- Yoga poses and sequences for yoga
|
||||
- Exercises and routines for fitness
|
||||
- Glossaries for any topic with its own nomenclature
|
||||
|
||||
Glossaries, in particular, are an essential reference. Once one is created, it should be adhered to in every lesson.
|
||||
|
||||
## `NOTES.md`
|
||||
|
||||
The user will sometimes express preferences of how they want to be taught, or things you should keep in mind. This is the place to record those preferences, so you can refer back to them when designing lessons or working with the user.
|
||||
83
.agents/skills/to-issues/SKILL.md
Normal file
83
.agents/skills/to-issues/SKILL.md
Normal file
@@ -0,0 +1,83 @@
|
||||
---
|
||||
name: to-issues
|
||||
description: Break a plan, spec, or PRD into independently-grabbable issues on the project issue tracker using tracer-bullet vertical slices. Use when user wants to convert a plan into issues, create implementation tickets, or break down work into issues.
|
||||
---
|
||||
|
||||
# To Issues
|
||||
|
||||
Break a plan into independently-grabbable issues using vertical slices (tracer bullets).
|
||||
|
||||
The issue tracker and triage label vocabulary should have been provided to you — run `/setup-matt-pocock-skills` if not.
|
||||
|
||||
## Process
|
||||
|
||||
### 1. Gather context
|
||||
|
||||
Work from whatever is already in the conversation context. If the user passes an issue reference (issue number, URL, or path) as an argument, fetch it from the issue tracker and read its full body and comments.
|
||||
|
||||
### 2. Explore the codebase (optional)
|
||||
|
||||
If you have not already explored the codebase, do so to understand the current state of the code. Issue titles and descriptions should use the project's domain glossary vocabulary, and respect ADRs in the area you're touching.
|
||||
|
||||
### 3. Draft vertical slices
|
||||
|
||||
Break the plan into **tracer bullet** issues. Each issue is a thin vertical slice that cuts through ALL integration layers end-to-end, NOT a horizontal slice of one layer.
|
||||
|
||||
Slices may be 'HITL' or 'AFK'. HITL slices require human interaction, such as an architectural decision or a design review. AFK slices can be implemented and merged without human interaction. Prefer AFK over HITL where possible.
|
||||
|
||||
<vertical-slice-rules>
|
||||
- Each slice delivers a narrow but COMPLETE path through every layer (schema, API, UI, tests)
|
||||
- A completed slice is demoable or verifiable on its own
|
||||
- Prefer many thin slices over few thick ones
|
||||
</vertical-slice-rules>
|
||||
|
||||
### 4. Quiz the user
|
||||
|
||||
Present the proposed breakdown as a numbered list. For each slice, show:
|
||||
|
||||
- **Title**: short descriptive name
|
||||
- **Type**: HITL / AFK
|
||||
- **Blocked by**: which other slices (if any) must complete first
|
||||
- **User stories covered**: which user stories this addresses (if the source material has them)
|
||||
|
||||
Ask the user:
|
||||
|
||||
- Does the granularity feel right? (too coarse / too fine)
|
||||
- Are the dependency relationships correct?
|
||||
- Should any slices be merged or split further?
|
||||
- Are the correct slices marked as HITL and AFK?
|
||||
|
||||
Iterate until the user approves the breakdown.
|
||||
|
||||
### 5. Publish the issues to the issue tracker
|
||||
|
||||
For each approved slice, publish a new issue to the issue tracker. Use the issue body template below. These issues are considered ready for AFK agents, so publish them with the correct triage label unless instructed otherwise.
|
||||
|
||||
Publish issues in dependency order (blockers first) so you can reference real issue identifiers in the "Blocked by" field.
|
||||
|
||||
<issue-template>
|
||||
## Parent
|
||||
|
||||
A reference to the parent issue on the issue tracker (if the source was an existing issue, otherwise omit this section).
|
||||
|
||||
## What to build
|
||||
|
||||
A concise description of this vertical slice. Describe the end-to-end behavior, not layer-by-layer implementation.
|
||||
|
||||
Avoid specific file paths or code snippets — they go stale fast. Exception: if a prototype produced a snippet that encodes a decision more precisely than prose can (state machine, reducer, schema, type shape), inline it here and note briefly that it came from a prototype. Trim to the decision-rich parts — not a working demo, just the important bits.
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] Criterion 1
|
||||
- [ ] Criterion 2
|
||||
- [ ] Criterion 3
|
||||
|
||||
## Blocked by
|
||||
|
||||
- A reference to the blocking ticket (if any)
|
||||
|
||||
Or "None - can start immediately" if no blockers.
|
||||
|
||||
</issue-template>
|
||||
|
||||
Do NOT close or modify any parent issue.
|
||||
74
.agents/skills/to-prd/SKILL.md
Normal file
74
.agents/skills/to-prd/SKILL.md
Normal file
@@ -0,0 +1,74 @@
|
||||
---
|
||||
name: to-prd
|
||||
description: Turn the current conversation context into a PRD and publish it to the project issue tracker. Use when user wants to create a PRD from the current context.
|
||||
---
|
||||
|
||||
This skill takes the current conversation context and codebase understanding and produces a PRD. Do NOT interview the user — just synthesize what you already know.
|
||||
|
||||
The issue tracker and triage label vocabulary should have been provided to you — run `/setup-matt-pocock-skills` if not.
|
||||
|
||||
## Process
|
||||
|
||||
1. Explore the repo to understand the current state of the codebase, if you haven't already. Use the project's domain glossary vocabulary throughout the PRD, and respect any ADRs in the area you're touching.
|
||||
|
||||
2. Sketch out the seams at which you're going to test the feature. Existing seams should be preferred to new ones. Use the highest seam possible. If new seams are needed, propose them at the highest point you can.
|
||||
|
||||
Check with the user that these seams match their expectations.
|
||||
|
||||
3. Write the PRD using the template below, then publish it to the project issue tracker. Apply the `ready-for-agent` triage label - no need for additional triage.
|
||||
|
||||
<prd-template>
|
||||
|
||||
## Problem Statement
|
||||
|
||||
The problem that the user is facing, from the user's perspective.
|
||||
|
||||
## Solution
|
||||
|
||||
The solution to the problem, from the user's perspective.
|
||||
|
||||
## User Stories
|
||||
|
||||
A LONG, numbered list of user stories. Each user story should be in the format of:
|
||||
|
||||
1. As an <actor>, I want a <feature>, so that <benefit>
|
||||
|
||||
<user-story-example>
|
||||
1. As a mobile bank customer, I want to see balance on my accounts, so that I can make better informed decisions about my spending
|
||||
</user-story-example>
|
||||
|
||||
This list of user stories should be extremely extensive and cover all aspects of the feature.
|
||||
|
||||
## Implementation Decisions
|
||||
|
||||
A list of implementation decisions that were made. This can include:
|
||||
|
||||
- The modules that will be built/modified
|
||||
- The interfaces of those modules that will be modified
|
||||
- Technical clarifications from the developer
|
||||
- Architectural decisions
|
||||
- Schema changes
|
||||
- API contracts
|
||||
- Specific interactions
|
||||
|
||||
Do NOT include specific file paths or code snippets. They may end up being outdated very quickly.
|
||||
|
||||
Exception: if a prototype produced a snippet that encodes a decision more precisely than prose can (state machine, reducer, schema, type shape), inline it within the relevant decision and note briefly that it came from a prototype. Trim to the decision-rich parts — not a working demo, just the important bits.
|
||||
|
||||
## Testing Decisions
|
||||
|
||||
A list of testing decisions that were made. Include:
|
||||
|
||||
- A description of what makes a good test (only test external behavior, not implementation details)
|
||||
- Which modules will be tested
|
||||
- Prior art for the tests (i.e. similar types of tests in the codebase)
|
||||
|
||||
## Out of Scope
|
||||
|
||||
A description of the things that are out of scope for this PRD.
|
||||
|
||||
## Further Notes
|
||||
|
||||
Any further notes about the feature.
|
||||
|
||||
</prd-template>
|
||||
168
.agents/skills/triage/AGENT-BRIEF.md
Normal file
168
.agents/skills/triage/AGENT-BRIEF.md
Normal file
@@ -0,0 +1,168 @@
|
||||
# Writing Agent Briefs
|
||||
|
||||
An agent brief is a structured comment posted on a GitHub issue when it moves to `ready-for-agent`. It is the authoritative specification that an AFK agent will work from. The original issue body and discussion are context — the agent brief is the contract.
|
||||
|
||||
## Principles
|
||||
|
||||
### Durability over precision
|
||||
|
||||
The issue may sit in `ready-for-agent` for days or weeks. The codebase will change in the meantime. Write the brief so it stays useful even as files are renamed, moved, or refactored.
|
||||
|
||||
- **Do** describe interfaces, types, and behavioral contracts
|
||||
- **Do** name specific types, function signatures, or config shapes that the agent should look for or modify
|
||||
- **Don't** reference file paths — they go stale
|
||||
- **Don't** reference line numbers
|
||||
- **Don't** assume the current implementation structure will remain the same
|
||||
|
||||
### Behavioral, not procedural
|
||||
|
||||
Describe **what** the system should do, not **how** to implement it. The agent will explore the codebase fresh and make its own implementation decisions.
|
||||
|
||||
- **Good:** "The `SkillConfig` type should accept an optional `schedule` field of type `CronExpression`"
|
||||
- **Bad:** "Open src/types/skill.ts and add a schedule field on line 42"
|
||||
- **Good:** "When a user runs `/triage` with no arguments, they should see a summary of issues needing attention"
|
||||
- **Bad:** "Add a switch statement in the main handler function"
|
||||
|
||||
### Complete acceptance criteria
|
||||
|
||||
The agent needs to know when it's done. Every agent brief must have concrete, testable acceptance criteria. Each criterion should be independently verifiable.
|
||||
|
||||
- **Good:** "Running `gh issue list --label needs-triage` returns issues that have been through initial classification"
|
||||
- **Bad:** "Triage should work correctly"
|
||||
|
||||
### Explicit scope boundaries
|
||||
|
||||
State what is out of scope. This prevents the agent from gold-plating or making assumptions about adjacent features.
|
||||
|
||||
## Template
|
||||
|
||||
```markdown
|
||||
## Agent Brief
|
||||
|
||||
**Category:** bug / enhancement
|
||||
**Summary:** one-line description of what needs to happen
|
||||
|
||||
**Current behavior:**
|
||||
Describe what happens now. For bugs, this is the broken behavior.
|
||||
For enhancements, this is the status quo the feature builds on.
|
||||
|
||||
**Desired behavior:**
|
||||
Describe what should happen after the agent's work is complete.
|
||||
Be specific about edge cases and error conditions.
|
||||
|
||||
**Key interfaces:**
|
||||
- `TypeName` — what needs to change and why
|
||||
- `functionName()` return type — what it currently returns vs what it should return
|
||||
- Config shape — any new configuration options needed
|
||||
|
||||
**Acceptance criteria:**
|
||||
- [ ] Specific, testable criterion 1
|
||||
- [ ] Specific, testable criterion 2
|
||||
- [ ] Specific, testable criterion 3
|
||||
|
||||
**Out of scope:**
|
||||
- Thing that should NOT be changed or addressed in this issue
|
||||
- Adjacent feature that might seem related but is separate
|
||||
```
|
||||
|
||||
## Examples
|
||||
|
||||
### Good agent brief (bug)
|
||||
|
||||
```markdown
|
||||
## Agent Brief
|
||||
|
||||
**Category:** bug
|
||||
**Summary:** Skill description truncation drops mid-word, producing broken output
|
||||
|
||||
**Current behavior:**
|
||||
When a skill description exceeds 1024 characters, it is truncated at exactly
|
||||
1024 characters regardless of word boundaries. This produces descriptions
|
||||
that end mid-word (e.g. "Use when the user wants to confi").
|
||||
|
||||
**Desired behavior:**
|
||||
Truncation should break at the last word boundary before 1024 characters
|
||||
and append "..." to indicate truncation.
|
||||
|
||||
**Key interfaces:**
|
||||
- The `SkillMetadata` type's `description` field — no type change needed,
|
||||
but the validation/processing logic that populates it needs to respect
|
||||
word boundaries
|
||||
- Any function that reads SKILL.md frontmatter and extracts the description
|
||||
|
||||
**Acceptance criteria:**
|
||||
- [ ] Descriptions under 1024 chars are unchanged
|
||||
- [ ] Descriptions over 1024 chars are truncated at the last word boundary
|
||||
before 1024 chars
|
||||
- [ ] Truncated descriptions end with "..."
|
||||
- [ ] The total length including "..." does not exceed 1024 chars
|
||||
|
||||
**Out of scope:**
|
||||
- Changing the 1024 char limit itself
|
||||
- Multi-line description support
|
||||
```
|
||||
|
||||
### Good agent brief (enhancement)
|
||||
|
||||
```markdown
|
||||
## Agent Brief
|
||||
|
||||
**Category:** enhancement
|
||||
**Summary:** Add `.out-of-scope/` directory support for tracking rejected feature requests
|
||||
|
||||
**Current behavior:**
|
||||
When a feature request is rejected, the issue is closed with a `wontfix` label
|
||||
and a comment. There is no persistent record of the decision or reasoning.
|
||||
Future similar requests require the maintainer to recall or search for the
|
||||
prior discussion.
|
||||
|
||||
**Desired behavior:**
|
||||
Rejected feature requests should be documented in `.out-of-scope/<concept>.md`
|
||||
files that capture the decision, reasoning, and links to all issues that
|
||||
requested the feature. When triaging new issues, these files should be
|
||||
checked for matches.
|
||||
|
||||
**Key interfaces:**
|
||||
- Markdown file format in `.out-of-scope/` — each file should have a
|
||||
`# Concept Name` heading, a `**Decision:**` line, a `**Reason:**` line,
|
||||
and a `**Prior requests:**` list with issue links
|
||||
- The triage workflow should read all `.out-of-scope/*.md` files early
|
||||
and match incoming issues against them by concept similarity
|
||||
|
||||
**Acceptance criteria:**
|
||||
- [ ] Closing a feature as wontfix creates/updates a file in `.out-of-scope/`
|
||||
- [ ] The file includes the decision, reasoning, and link to the closed issue
|
||||
- [ ] If a matching `.out-of-scope/` file already exists, the new issue is
|
||||
appended to its "Prior requests" list rather than creating a duplicate
|
||||
- [ ] During triage, existing `.out-of-scope/` files are checked and surfaced
|
||||
when a new issue matches a prior rejection
|
||||
|
||||
**Out of scope:**
|
||||
- Automated matching (human confirms the match)
|
||||
- Reopening previously rejected features
|
||||
- Bug reports (only enhancement rejections go to `.out-of-scope/`)
|
||||
```
|
||||
|
||||
### Bad agent brief
|
||||
|
||||
```markdown
|
||||
## Agent Brief
|
||||
|
||||
**Summary:** Fix the triage bug
|
||||
|
||||
**What to do:**
|
||||
The triage thing is broken. Look at the main file and fix it.
|
||||
The function around line 150 has the issue.
|
||||
|
||||
**Files to change:**
|
||||
- src/triage/handler.ts (line 150)
|
||||
- src/types.ts (line 42)
|
||||
```
|
||||
|
||||
This is bad because:
|
||||
- No category
|
||||
- Vague description ("the triage thing is broken")
|
||||
- References file paths and line numbers that will go stale
|
||||
- No acceptance criteria
|
||||
- No scope boundaries
|
||||
- No description of current vs desired behavior
|
||||
101
.agents/skills/triage/OUT-OF-SCOPE.md
Normal file
101
.agents/skills/triage/OUT-OF-SCOPE.md
Normal file
@@ -0,0 +1,101 @@
|
||||
# Out-of-Scope Knowledge Base
|
||||
|
||||
The `.out-of-scope/` directory in a repo stores persistent records of rejected feature requests. It serves two purposes:
|
||||
|
||||
1. **Institutional memory** — why a feature was rejected, so the reasoning isn't lost when the issue is closed
|
||||
2. **Deduplication** — when a new issue comes in that matches a prior rejection, the skill can surface the previous decision instead of re-litigating it
|
||||
|
||||
## Directory structure
|
||||
|
||||
```
|
||||
.out-of-scope/
|
||||
├── dark-mode.md
|
||||
├── plugin-system.md
|
||||
└── graphql-api.md
|
||||
```
|
||||
|
||||
One file per **concept**, not per issue. Multiple issues requesting the same thing are grouped under one file.
|
||||
|
||||
## File format
|
||||
|
||||
The file should be written in a relaxed, readable style — more like a short design document than a database entry. Use paragraphs, code samples, and examples to make the reasoning clear and useful to someone encountering it for the first time.
|
||||
|
||||
```markdown
|
||||
# Dark Mode
|
||||
|
||||
This project does not support dark mode or user-facing theming.
|
||||
|
||||
## Why this is out of scope
|
||||
|
||||
The rendering pipeline assumes a single color palette defined in
|
||||
`ThemeConfig`. Supporting multiple themes would require:
|
||||
|
||||
- A theme context provider wrapping the entire component tree
|
||||
- Per-component theme-aware style resolution
|
||||
- A persistence layer for user theme preferences
|
||||
|
||||
This is a significant architectural change that doesn't align with the
|
||||
project's focus on content authoring. Theming is a concern for downstream
|
||||
consumers who embed or redistribute the output.
|
||||
|
||||
```ts
|
||||
// The current ThemeConfig interface is not designed for runtime switching:
|
||||
interface ThemeConfig {
|
||||
colors: ColorPalette; // single palette, resolved at build time
|
||||
fonts: FontStack;
|
||||
}
|
||||
```
|
||||
|
||||
## Prior requests
|
||||
|
||||
- #42 — "Add dark mode support"
|
||||
- #87 — "Night theme for accessibility"
|
||||
- #134 — "Dark theme option"
|
||||
```
|
||||
|
||||
### Naming the file
|
||||
|
||||
Use a short, descriptive kebab-case name for the concept: `dark-mode.md`, `plugin-system.md`, `graphql-api.md`. The name should be recognizable enough that someone browsing the directory understands what was rejected without opening the file.
|
||||
|
||||
### Writing the reason
|
||||
|
||||
The reason should be substantive — not "we don't want this" but why. Good reasons reference:
|
||||
|
||||
- Project scope or philosophy ("This project focuses on X; theming is a downstream concern")
|
||||
- Technical constraints ("Supporting this would require Y, which conflicts with our Z architecture")
|
||||
- Strategic decisions ("We chose to use A instead of B because...")
|
||||
|
||||
The reason should be durable. Avoid referencing temporary circumstances ("we're too busy right now") — those aren't real rejections, they're deferrals.
|
||||
|
||||
## When to check `.out-of-scope/`
|
||||
|
||||
During triage (Step 1: Gather context), read all files in `.out-of-scope/`. When evaluating a new issue:
|
||||
|
||||
- Check if the request matches an existing out-of-scope concept
|
||||
- Matching is by concept similarity, not keyword — "night theme" matches `dark-mode.md`
|
||||
- If there's a match, surface it to the maintainer: "This is similar to `.out-of-scope/dark-mode.md` — we rejected this before because [reason]. Do you still feel the same way?"
|
||||
|
||||
The maintainer may:
|
||||
|
||||
- **Confirm** — the new issue gets added to the existing file's "Prior requests" list, then closed
|
||||
- **Reconsider** — the out-of-scope file gets deleted or updated, and the issue proceeds through normal triage
|
||||
- **Disagree** — the issues are related but distinct, proceed with normal triage
|
||||
|
||||
## When to write to `.out-of-scope/`
|
||||
|
||||
Only when an **enhancement** (not a bug) is rejected as `wontfix`. The flow:
|
||||
|
||||
1. Maintainer decides a feature request is out of scope
|
||||
2. Check if a matching `.out-of-scope/` file already exists
|
||||
3. If yes: append the new issue to the "Prior requests" list
|
||||
4. If no: create a new file with the concept name, decision, reason, and first prior request
|
||||
5. Post a comment on the issue explaining the decision and mentioning the `.out-of-scope/` file
|
||||
6. Close the issue with the `wontfix` label
|
||||
|
||||
## Updating or removing out-of-scope files
|
||||
|
||||
If the maintainer changes their mind about a previously rejected concept:
|
||||
|
||||
- Delete the `.out-of-scope/` file
|
||||
- The skill does not need to reopen old issues — they're historical records
|
||||
- The new issue that triggered the reconsideration proceeds through normal triage
|
||||
103
.agents/skills/triage/SKILL.md
Normal file
103
.agents/skills/triage/SKILL.md
Normal file
@@ -0,0 +1,103 @@
|
||||
---
|
||||
name: triage
|
||||
description: Triage issues through a state machine driven by triage roles. Use when user wants to create an issue, triage issues, review incoming bugs or feature requests, prepare issues for an AFK agent, or manage issue workflow.
|
||||
---
|
||||
|
||||
# Triage
|
||||
|
||||
Move issues on the project issue tracker through a small state machine of triage roles.
|
||||
|
||||
Every comment or issue posted to the issue tracker during triage **must** start with this disclaimer:
|
||||
|
||||
```
|
||||
> *This was generated by AI during triage.*
|
||||
```
|
||||
|
||||
## Reference docs
|
||||
|
||||
- [AGENT-BRIEF.md](AGENT-BRIEF.md) — how to write durable agent briefs
|
||||
- [OUT-OF-SCOPE.md](OUT-OF-SCOPE.md) — how the `.out-of-scope/` knowledge base works
|
||||
|
||||
## Roles
|
||||
|
||||
Two **category** roles:
|
||||
|
||||
- `bug` — something is broken
|
||||
- `enhancement` — new feature or improvement
|
||||
|
||||
Five **state** roles:
|
||||
|
||||
- `needs-triage` — maintainer needs to evaluate
|
||||
- `needs-info` — waiting on reporter for more information
|
||||
- `ready-for-agent` — fully specified, ready for an AFK agent
|
||||
- `ready-for-human` — needs human implementation
|
||||
- `wontfix` — will not be actioned
|
||||
|
||||
Every triaged issue should carry exactly one category role and one state role. If state roles conflict, flag it and ask the maintainer before doing anything else.
|
||||
|
||||
These are canonical role names — the actual label strings used in the issue tracker may differ. The mapping should have been provided to you - run `/setup-matt-pocock-skills` if not.
|
||||
|
||||
State transitions: an unlabeled issue normally goes to `needs-triage` first; from there it moves to `needs-info`, `ready-for-agent`, `ready-for-human`, or `wontfix`. `needs-info` returns to `needs-triage` once the reporter replies. The maintainer can override at any time — flag transitions that look unusual and ask before proceeding.
|
||||
|
||||
## Invocation
|
||||
|
||||
The maintainer invokes `/triage` and describes what they want in natural language. Interpret the request and act. Examples:
|
||||
|
||||
- "Show me anything that needs my attention"
|
||||
- "Let's look at #42"
|
||||
- "Move #42 to ready-for-agent"
|
||||
- "What's ready for agents to pick up?"
|
||||
|
||||
## Show what needs attention
|
||||
|
||||
Query the issue tracker and present three buckets, oldest first:
|
||||
|
||||
1. **Unlabeled** — never triaged.
|
||||
2. **`needs-triage`** — evaluation in progress.
|
||||
3. **`needs-info` with reporter activity since the last triage notes** — needs re-evaluation.
|
||||
|
||||
Show counts and a one-line summary per issue. Let the maintainer pick.
|
||||
|
||||
## Triage a specific issue
|
||||
|
||||
1. **Gather context.** Read the full issue (body, comments, labels, reporter, dates). Parse any prior triage notes so you don't re-ask resolved questions. Explore the codebase using the project's domain glossary, respecting ADRs in the area. Read `.out-of-scope/*.md` and surface any prior rejection that resembles this issue.
|
||||
|
||||
2. **Recommend.** Tell the maintainer your category and state recommendation with reasoning, plus a brief codebase summary relevant to the issue. Wait for direction.
|
||||
|
||||
3. **Reproduce (bugs only).** Before any grilling, attempt reproduction: read the reporter's steps, trace the relevant code, run tests or commands. Report what happened — successful repro with code path, failed repro, or insufficient detail (a strong `needs-info` signal). A confirmed repro makes a much stronger agent brief.
|
||||
|
||||
4. **Grill (if needed).** If the issue needs fleshing out, run a `/grill-with-docs` session.
|
||||
|
||||
5. **Apply the outcome:**
|
||||
- `ready-for-agent` — post an agent brief comment ([AGENT-BRIEF.md](AGENT-BRIEF.md)).
|
||||
- `ready-for-human` — same structure as an agent brief, but note why it can't be delegated (judgment calls, external access, design decisions, manual testing).
|
||||
- `needs-info` — post triage notes (template below).
|
||||
- `wontfix` (bug) — polite explanation, then close.
|
||||
- `wontfix` (enhancement) — write to `.out-of-scope/`, link to it from a comment, then close ([OUT-OF-SCOPE.md](OUT-OF-SCOPE.md)).
|
||||
- `needs-triage` — apply the role. Optional comment if there's partial progress.
|
||||
|
||||
## Quick state override
|
||||
|
||||
If the maintainer says "move #42 to ready-for-agent", trust them and apply the role directly. Confirm what you're about to do (role changes, comment, close), then act. Skip grilling. If moving to `ready-for-agent` without a grilling session, ask whether they want to write an agent brief.
|
||||
|
||||
## Needs-info template
|
||||
|
||||
```markdown
|
||||
## Triage Notes
|
||||
|
||||
**What we've established so far:**
|
||||
|
||||
- point 1
|
||||
- point 2
|
||||
|
||||
**What we still need from you (@reporter):**
|
||||
|
||||
- question 1
|
||||
- question 2
|
||||
```
|
||||
|
||||
Capture everything resolved during grilling under "established so far" so the work isn't lost. Questions must be specific and actionable, not "please provide more info".
|
||||
|
||||
## Resuming a previous session
|
||||
|
||||
If prior triage notes exist on the issue, read them, check whether the reporter has answered any outstanding questions, and present an updated picture before continuing. Don't re-ask resolved questions.
|
||||
117
.agents/skills/write-a-skill/SKILL.md
Normal file
117
.agents/skills/write-a-skill/SKILL.md
Normal file
@@ -0,0 +1,117 @@
|
||||
---
|
||||
name: write-a-skill
|
||||
description: Create new agent skills with proper structure, progressive disclosure, and bundled resources. Use when user wants to create, write, or build a new skill.
|
||||
---
|
||||
|
||||
# Writing Skills
|
||||
|
||||
## Process
|
||||
|
||||
1. **Gather requirements** - ask user about:
|
||||
- What task/domain does the skill cover?
|
||||
- What specific use cases should it handle?
|
||||
- Does it need executable scripts or just instructions?
|
||||
- Any reference materials to include?
|
||||
|
||||
2. **Draft the skill** - create:
|
||||
- SKILL.md with concise instructions
|
||||
- Additional reference files if content exceeds 500 lines
|
||||
- Utility scripts if deterministic operations needed
|
||||
|
||||
3. **Review with user** - present draft and ask:
|
||||
- Does this cover your use cases?
|
||||
- Anything missing or unclear?
|
||||
- Should any section be more/less detailed?
|
||||
|
||||
## Skill Structure
|
||||
|
||||
```
|
||||
skill-name/
|
||||
├── SKILL.md # Main instructions (required)
|
||||
├── REFERENCE.md # Detailed docs (if needed)
|
||||
├── EXAMPLES.md # Usage examples (if needed)
|
||||
└── scripts/ # Utility scripts (if needed)
|
||||
└── helper.js
|
||||
```
|
||||
|
||||
## SKILL.md Template
|
||||
|
||||
```md
|
||||
---
|
||||
name: skill-name
|
||||
description: Brief description of capability. Use when [specific triggers].
|
||||
---
|
||||
|
||||
# Skill Name
|
||||
|
||||
## Quick start
|
||||
|
||||
[Minimal working example]
|
||||
|
||||
## Workflows
|
||||
|
||||
[Step-by-step processes with checklists for complex tasks]
|
||||
|
||||
## Advanced features
|
||||
|
||||
[Link to separate files: See [REFERENCE.md](REFERENCE.md)]
|
||||
```
|
||||
|
||||
## Description Requirements
|
||||
|
||||
The description is **the only thing your agent sees** when deciding which skill to load. It's surfaced in the system prompt alongside all other installed skills. Your agent reads these descriptions and picks the relevant skill based on the user's request.
|
||||
|
||||
**Goal**: Give your agent just enough info to know:
|
||||
|
||||
1. What capability this skill provides
|
||||
2. When/why to trigger it (specific keywords, contexts, file types)
|
||||
|
||||
**Format**:
|
||||
|
||||
- Max 1024 chars
|
||||
- Write in third person
|
||||
- First sentence: what it does
|
||||
- Second sentence: "Use when [specific triggers]"
|
||||
|
||||
**Good example**:
|
||||
|
||||
```
|
||||
Extract text and tables from PDF files, fill forms, merge documents. Use when working with PDF files or when user mentions PDFs, forms, or document extraction.
|
||||
```
|
||||
|
||||
**Bad example**:
|
||||
|
||||
```
|
||||
Helps with documents.
|
||||
```
|
||||
|
||||
The bad example gives your agent no way to distinguish this from other document skills.
|
||||
|
||||
## When to Add Scripts
|
||||
|
||||
Add utility scripts when:
|
||||
|
||||
- Operation is deterministic (validation, formatting)
|
||||
- Same code would be generated repeatedly
|
||||
- Errors need explicit handling
|
||||
|
||||
Scripts save tokens and improve reliability vs generated code.
|
||||
|
||||
## When to Split Files
|
||||
|
||||
Split into separate files when:
|
||||
|
||||
- SKILL.md exceeds 100 lines
|
||||
- Content has distinct domains (finance vs sales schemas)
|
||||
- Advanced features are rarely needed
|
||||
|
||||
## Review Checklist
|
||||
|
||||
After drafting, verify:
|
||||
|
||||
- [ ] Description includes triggers ("Use when...")
|
||||
- [ ] SKILL.md under 100 lines
|
||||
- [ ] No time-sensitive info
|
||||
- [ ] Consistent terminology
|
||||
- [ ] Concrete examples included
|
||||
- [ ] References one level deep
|
||||
7
.agents/skills/zoom-out/SKILL.md
Normal file
7
.agents/skills/zoom-out/SKILL.md
Normal file
@@ -0,0 +1,7 @@
|
||||
---
|
||||
name: zoom-out
|
||||
description: Tell the agent to zoom out and give broader context or a higher-level perspective. Use when you're unfamiliar with a section of code or need to understand how it fits into the bigger picture.
|
||||
disable-model-invocation: true
|
||||
---
|
||||
|
||||
I don't know this area of code well. Go up a layer of abstraction. Give me a map of all the relevant modules and callers, using the project's domain glossary vocabulary.
|
||||
1
.claude/skills/caveman
Symbolic link
1
.claude/skills/caveman
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/caveman
|
||||
1
.claude/skills/diagnose
Symbolic link
1
.claude/skills/diagnose
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/diagnose
|
||||
@@ -14,6 +14,8 @@ description: DTO 数据传输对象规范。创建或修改 DTO 文件、请求/
|
||||
- 创建 `XXXRequest`、`XXXResponse`、`XXXReq`、`XXXResp` 结构体
|
||||
- 添加或修改 API 接口的输入输出参数
|
||||
|
||||
---
|
||||
|
||||
## 必须项(MUST)
|
||||
|
||||
### 1. Description 标签规范
|
||||
@@ -36,59 +38,150 @@ type CreateUserRequest struct {
|
||||
}
|
||||
```
|
||||
|
||||
### 2. 枚举字段必须列出所有可能值(中文)
|
||||
### 2. 枚举字段:int vs string 选择
|
||||
|
||||
**所有枚举类型字段必须在 `description` 中列出所有可能值和对应的中文含义**
|
||||
**必须按以下规则选择类型,禁止混用:**
|
||||
|
||||
| 场景 | 类型 | 示例 |
|
||||
|------|------|------|
|
||||
| 状态类(生命周期阶段) | `int` | 待支付→已完成→已关闭 |
|
||||
| 布尔状态(启用/禁用) | `int` | `0=禁用, 1=启用` |
|
||||
| 类型/方式类(种类) | `string` | `"wechat"`, `"single_card"` |
|
||||
| 平台/标识符类 | `string` | `"web"`, `"h5"`, `"all"` |
|
||||
|
||||
```go
|
||||
// 用户类型
|
||||
UserType int `json:"user_type" description:"用户类型 (1:超级管理员, 2:平台用户, 3:代理账号, 4:企业账号)"`
|
||||
// ✅ 状态 → int
|
||||
Status int `json:"status"`
|
||||
PaymentStatus int `json:"payment_status"`
|
||||
|
||||
// 角色类型
|
||||
RoleType int `json:"role_type" description:"角色类型 (1:平台角色, 2:客户角色)"`
|
||||
|
||||
// 权限类型
|
||||
PermType int `json:"perm_type" description:"权限类型 (1:菜单, 2:按钮)"`
|
||||
|
||||
// 状态字段
|
||||
Status int `json:"status" description:"状态 (0:禁用, 1:启用)"`
|
||||
|
||||
// 适用端口
|
||||
Platform string `json:"platform" description:"适用端口 (all:全部, web:Web后台, h5:H5端)"`
|
||||
// ✅ 类型/方式 → string
|
||||
PaymentMethod string `json:"payment_method" validate:"required,oneof=wechat offline"`
|
||||
OrderType string `json:"order_type" validate:"required,oneof=single_card device"`
|
||||
```
|
||||
|
||||
❌ **禁止使用英文枚举值**:
|
||||
### 3. Int 状态值约定
|
||||
|
||||
#### 3.1 通用禁用/启用
|
||||
|
||||
**必须用全局常量,禁止自定义(尤其禁止 1=启用 2=禁用 这种反向写法)**:
|
||||
|
||||
```go
|
||||
UserType int `json:"user_type" description:"用户类型 (1:SuperAdmin, 2:Platform)"` // 错误!
|
||||
// pkg/constants/constants.go 已定义,直接使用
|
||||
StatusDisabled = 0 // 禁用
|
||||
StatusEnabled = 1 // 启用
|
||||
```
|
||||
|
||||
### 3. 验证标签与 OpenAPI 标签一致
|
||||
✅ 正确:`description:"状态 (0:禁用, 1:启用)"`
|
||||
❌ 禁止:`description:"状态 (1:启用, 2:禁用)"`
|
||||
|
||||
**所有验证约束必须同时在 `validate` 和 OpenAPI 标签中声明**
|
||||
#### 3.2 生命周期状态
|
||||
|
||||
从 **1** 开始递增,0 不使用(避免与 Go 零值混淆):
|
||||
|
||||
```go
|
||||
const (
|
||||
RechargeStatusPending = 1 // 待支付
|
||||
RechargeStatusPaid = 2 // 已支付
|
||||
RechargeStatusCompleted = 3 // 已完成
|
||||
RechargeStatusClosed = 4 // 已关闭
|
||||
)
|
||||
```
|
||||
|
||||
### 4. 枚举列表必须从 constants 原文抄写
|
||||
|
||||
**DTO description 的枚举列表必须与 `pkg/constants/` 定义完全一致,不可凭记忆填写。**
|
||||
|
||||
操作步骤:
|
||||
1. 先查/定义 `pkg/constants/` 中的枚举常量
|
||||
2. 将常量注释**原文抄写**到 description
|
||||
|
||||
```go
|
||||
// constants.go 中:
|
||||
RechargeStatusPending = 1 // 待支付
|
||||
RechargeStatusPaid = 2 // 已支付
|
||||
RechargeStatusCompleted = 3 // 已完成
|
||||
RechargeStatusClosed = 4 // 已关闭
|
||||
RechargeStatusRefunded = 5 // 已退款
|
||||
|
||||
// DTO description 从上面抄:
|
||||
Status int `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款)"`
|
||||
```
|
||||
|
||||
❌ 禁止(description 与 constants 不一致,是历史 bug 的根因):
|
||||
```go
|
||||
// constants 说 3=已完成,description 却写 3:已取消
|
||||
Status int `json:"status" description:"状态 (1:待支付, 2:已完成, 3:已取消)"`
|
||||
```
|
||||
|
||||
### 5. description 格式标准
|
||||
|
||||
**统一格式**:`字段含义 (值1:中文含义1, 值2:中文含义2)`
|
||||
|
||||
- 值与含义之间用**冒号** `:`(禁止用等号 `=`)
|
||||
- 多个值之间用**逗号加空格** `, `
|
||||
- 含义必须是**中文**
|
||||
|
||||
```go
|
||||
// ✅ 统一格式
|
||||
Status int `description:"状态 (1:待支付, 2:已支付, 3:已完成)"`
|
||||
Platform string `description:"适用端口 (all:全部, web:Web后台, h5:H5端)"`
|
||||
|
||||
// ❌ 格式混乱
|
||||
Status int `description:"状态 (0=禁用, 1=启用)"` // 用等号
|
||||
Status int `description:"0=禁用 1=启用"` // 无括号无逗号
|
||||
```
|
||||
|
||||
### 6. Response DTO 的状态字段必须同时返回 int 和 text
|
||||
|
||||
**所有 Response DTO 中的 int 状态字段,必须同时提供对应的 `_name` 文字字段。**
|
||||
|
||||
原因:防止前端维护映射表出错(历史上已有因此产生 bug 的案例)。
|
||||
|
||||
```go
|
||||
// ✅ Response DTO 标准写法
|
||||
type XxxResponse struct {
|
||||
Status int `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款)"`
|
||||
StatusName string `json:"status_name" description:"状态名称(中文)"`
|
||||
}
|
||||
|
||||
// toResponse 函数中赋值
|
||||
func rechargeStatusName(status int) string {
|
||||
switch status {
|
||||
case constants.RechargeStatusPending:
|
||||
return "待支付"
|
||||
case constants.RechargeStatusCompleted:
|
||||
return "已完成"
|
||||
// ...
|
||||
default:
|
||||
return "未知"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
字段命名约定:`status` → `status_name`,`payment_status` → `payment_status_name`
|
||||
|
||||
**例外**:Request DTO(查询过滤、创建请求)不需要 `_name` 字段。
|
||||
|
||||
### 7. 验证标签与 OpenAPI 标签一致
|
||||
|
||||
```go
|
||||
Username string `json:"username" validate:"required,min=3,max=50" required:"true" minLength:"3" maxLength:"50" description:"用户名"`
|
||||
```
|
||||
|
||||
**标签对照表**:
|
||||
| validate 标签 | OpenAPI 标签 |
|
||||
|--------------|--------------|
|
||||
| `required` | `required:"true"` |
|
||||
| `min=N,max=M`(数值) | `minimum:"N" maximum:"M"` |
|
||||
| `min=N,max=M`(字符串) | `minLength:"N" maxLength:"M"` |
|
||||
| `oneof=A B C` | description 中说明枚举值 |
|
||||
|
||||
| validate 标签 | OpenAPI 标签 | 说明 |
|
||||
|--------------|--------------|------|
|
||||
| `required` | `required:"true"` | 必填字段 |
|
||||
| `min=N,max=M` | `minimum:"N" maximum:"M"` | 数值范围 |
|
||||
| `min=N,max=M` (字符串) | `minLength:"N" maxLength:"M"` | 字符串长度 |
|
||||
| `len=N` | `minLength:"N" maxLength:"N"` | 固定长度 |
|
||||
| `oneof=A B C` | `description` 中说明 | 枚举值 |
|
||||
|
||||
### 4. 请求参数类型标签
|
||||
|
||||
**Query 参数和 Path 参数必须添加对应标签**
|
||||
### 8. 请求参数类型标签
|
||||
|
||||
```go
|
||||
// Query 参数
|
||||
type ListRequest struct {
|
||||
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
|
||||
UserType *int `json:"user_type" query:"user_type" validate:"omitempty,min=1,max=4" minimum:"1" maximum:"4" description:"用户类型 (1:超级管理员, 2:平台用户, 3:代理账号, 4:企业账号)"`
|
||||
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
|
||||
Status *int `json:"status" query:"status" validate:"omitempty,min=1,max=4" minimum:"1" maximum:"4" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭)"`
|
||||
}
|
||||
|
||||
// Path 参数
|
||||
@@ -97,43 +190,50 @@ type IDReq struct {
|
||||
}
|
||||
```
|
||||
|
||||
### 5. 响应 DTO 完整性
|
||||
|
||||
**所有响应 DTO 的字段都必须有完整的 `description` 标签**
|
||||
### 9. 响应 DTO 完整性
|
||||
|
||||
```go
|
||||
type AccountResponse struct {
|
||||
ID uint `json:"id" description:"账号ID"`
|
||||
Username string `json:"username" description:"用户名"`
|
||||
UserType int `json:"user_type" description:"用户类型 (1:超级管理员, 2:平台用户, 3:代理账号, 4:企业账号)"`
|
||||
Status int `json:"status" description:"状态 (0:禁用, 1:启用)"`
|
||||
CreatedAt string `json:"created_at" description:"创建时间"`
|
||||
UpdatedAt string `json:"updated_at" description:"更新时间"`
|
||||
ID uint `json:"id" description:"账号ID"`
|
||||
Username string `json:"username" description:"用户名"`
|
||||
UserType int `json:"user_type" description:"用户类型 (1:超级管理员, 2:平台用户, 3:代理账号, 4:企业账号)"`
|
||||
Status int `json:"status" description:"状态 (0:禁用, 1:启用)"`
|
||||
StatusName string `json:"status_name" description:"状态名称(中文)"`
|
||||
CreatedAt string `json:"created_at" description:"创建时间"`
|
||||
UpdatedAt string `json:"updated_at" description:"更新时间"`
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## AI 助手必须执行的检查
|
||||
|
||||
**在创建或修改任何 DTO 文件后,必须执行以下检查:**
|
||||
|
||||
1. ✅ 检查所有字段是否有 `description` 标签
|
||||
2. ✅ 检查枚举字段是否列出了所有可能值(中文)
|
||||
3. ✅ 检查状态字段是否说明了 0 和 1 的含义
|
||||
4. ✅ 检查 validate 标签与 OpenAPI 标签是否一致
|
||||
5. ✅ 检查是否禁止使用行内注释替代 description
|
||||
6. ✅ 检查枚举值是否使用中文而非英文
|
||||
7. ✅ 重新生成 OpenAPI 文档验证:`go run cmd/gendocs/main.go`
|
||||
1. ✅ 所有字段有 `description` 标签(无行内注释)
|
||||
2. ✅ 枚举类型选择正确(状态用 int,类型/方式用 string)
|
||||
3. ✅ 禁用/启用使用 `0=禁用, 1=启用`(禁止 1=启用 2=禁用)
|
||||
4. ✅ description 枚举列表已从 `pkg/constants/` 原文抄写,无遗漏
|
||||
5. ✅ description 格式统一(冒号 `:`,括号,逗号)
|
||||
6. ✅ Response DTO 有 `_name` 伴生字段
|
||||
7. ✅ validate 标签与 OpenAPI 标签一致
|
||||
8. ✅ 重新生成 OpenAPI 文档验证:`go run cmd/gendocs/main.go`
|
||||
|
||||
**详细检查清单**: 参见 `docs/code-review-checklist.md`
|
||||
**完整枚举规范**: 参见 [`docs/enum-status-standards.md`](../../docs/enum-status-standards.md)
|
||||
|
||||
---
|
||||
|
||||
## 常见枚举字段标准值
|
||||
|
||||
```go
|
||||
// 用户类型
|
||||
// 用户类型(从 constants.UserType* 抄)
|
||||
description:"用户类型 (1:超级管理员, 2:平台用户, 3:代理账号, 4:企业账号)"
|
||||
|
||||
// 角色类型
|
||||
description:"角色类型 (1:平台角色, 2:客户角色)"
|
||||
// 通用启用/禁用(从 constants.StatusEnabled/Disabled 抄)
|
||||
description:"状态 (0:禁用, 1:启用)"
|
||||
|
||||
// 充值状态(从 constants.RechargeStatus* 抄)
|
||||
description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款)"
|
||||
|
||||
// 权限类型
|
||||
description:"权限类型 (1:菜单, 2:按钮)"
|
||||
@@ -141,9 +241,6 @@ description:"权限类型 (1:菜单, 2:按钮)"
|
||||
// 适用端口
|
||||
description:"适用端口 (all:全部, web:Web后台, h5:H5端)"
|
||||
|
||||
// 状态
|
||||
description:"状态 (0:禁用, 1:启用)"
|
||||
|
||||
// 店铺层级
|
||||
description:"店铺层级 (1-7级)"
|
||||
```
|
||||
|
||||
1
.claude/skills/grill-me
Symbolic link
1
.claude/skills/grill-me
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/grill-me
|
||||
1
.claude/skills/grill-with-docs
Symbolic link
1
.claude/skills/grill-with-docs
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/grill-with-docs
|
||||
1
.claude/skills/handoff
Symbolic link
1
.claude/skills/handoff
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/handoff
|
||||
1
.claude/skills/improve-codebase-architecture
Symbolic link
1
.claude/skills/improve-codebase-architecture
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/improve-codebase-architecture
|
||||
1
.claude/skills/prototype
Symbolic link
1
.claude/skills/prototype
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/prototype
|
||||
1
.claude/skills/setup-matt-pocock-skills
Symbolic link
1
.claude/skills/setup-matt-pocock-skills
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/setup-matt-pocock-skills
|
||||
@@ -1,260 +0,0 @@
|
||||
---
|
||||
name: systematic-debugging
|
||||
description: 遇到任何 bug、异常行为、报错时必须使用。在提出任何修复方案之前,强制执行根因分析流程。适用于 API 报错、数据异常、业务逻辑错误、性能问题等所有技术问题。
|
||||
---
|
||||
|
||||
# 系统化调试方法论
|
||||
|
||||
## 铁律
|
||||
|
||||
```
|
||||
没有找到根因,禁止提出任何修复方案。
|
||||
```
|
||||
|
||||
改之前先搞懂为什么坏了。猜测不是调试,验证假设才是。
|
||||
|
||||
---
|
||||
|
||||
## 什么时候用
|
||||
|
||||
**所有技术问题都用这个流程**:
|
||||
- API 接口报错(4xx / 5xx)
|
||||
- 业务数据异常(金额不对、状态流转错误)
|
||||
- 性能问题(接口慢、数据库慢查询)
|
||||
- 异步任务失败(Asynq 任务报错/卡住)
|
||||
- 构建失败、启动失败
|
||||
|
||||
**尤其是以下场景**:
|
||||
- 时间紧迫(越急越不能瞎猜)
|
||||
- "很简单的问题"(简单问题也有根因)
|
||||
- 已经试了一次修复但没解决
|
||||
- 不完全理解为什么出问题
|
||||
|
||||
---
|
||||
|
||||
## 四阶段流程
|
||||
|
||||
必须按顺序完成每个阶段,不可跳过。
|
||||
|
||||
### 阶段一:根因调查
|
||||
|
||||
**这是最重要的阶段,占整个调试时间的 60%。没完成本阶段,禁止进入阶段二。**
|
||||
|
||||
#### 1. 仔细阅读错误信息
|
||||
|
||||
- 完整阅读 stack trace,不要跳过
|
||||
- 注意行号、文件路径、错误码
|
||||
- 很多时候答案就在错误信息里
|
||||
- 检查 `logs/app.log` 和 `logs/access.log` 中的上下文
|
||||
|
||||
#### 2. 稳定复现
|
||||
|
||||
- 能稳定触发吗?精确的请求参数是什么?
|
||||
- 用 curl 或 Postman 复现,记录完整的请求和响应
|
||||
- 不能复现 → 收集更多数据(检查日志、Redis 状态、数据库记录),**不要瞎猜**
|
||||
|
||||
#### 3. 检查最近改动
|
||||
|
||||
- `git diff` / `git log --oneline -10` 看最近改了什么
|
||||
- 新加了什么依赖?改了什么配置?改了什么 SQL?
|
||||
- 对比改动前后的行为差异
|
||||
|
||||
#### 4. 逐层诊断(针对本项目架构)
|
||||
|
||||
本项目有明确的分层架构,问题一定出在某一层的边界:
|
||||
|
||||
```
|
||||
请求 → Fiber Middleware → Handler → Service → Store → PostgreSQL/Redis
|
||||
↑ ↑ ↑ ↑ ↑
|
||||
认证/限流 参数解析 业务逻辑 SQL/缓存 数据本身
|
||||
```
|
||||
|
||||
**在每个层边界确认数据是否正确**:
|
||||
|
||||
```go
|
||||
// Handler 层 — 请求进来的参数对不对?
|
||||
logger.Info("Handler 收到请求",
|
||||
zap.Any("params", req),
|
||||
zap.String("request_id", requestID),
|
||||
)
|
||||
|
||||
// Service 层 — 传给业务逻辑的数据对不对?
|
||||
logger.Info("Service 开始处理",
|
||||
zap.Uint("user_id", userID),
|
||||
zap.Any("input", input),
|
||||
)
|
||||
|
||||
// Store 层 — SQL 查询/写入的数据对不对?
|
||||
// 开启 GORM Debug 模式查看实际 SQL
|
||||
db.Debug().Where(...).Find(&result)
|
||||
|
||||
// Redis 层 — 缓存的数据对不对?
|
||||
// 用 redis-cli 直接检查 key 的值
|
||||
// GET auth:token:{token}
|
||||
// GET sim:status:{iccid}
|
||||
```
|
||||
|
||||
**跑一次 → 看日志 → 找到断裂的那一层 → 再深入该层排查。**
|
||||
|
||||
#### 5. 追踪数据流
|
||||
|
||||
如果错误深藏在调用链中:
|
||||
- 坏数据从哪来的?
|
||||
- 谁调用了这个函数,传了什么参数?
|
||||
- 一直往上追,直到找到数据变坏的源头
|
||||
- **修源头,不修症状**
|
||||
|
||||
---
|
||||
|
||||
### 阶段二:模式分析
|
||||
|
||||
**找到参照物,对比差异。**
|
||||
|
||||
#### 1. 找能用的参照
|
||||
|
||||
项目里有没有类似的、能正常工作的代码?
|
||||
|
||||
| 如果问题在... | 参照物在... |
|
||||
|-------------|-----------|
|
||||
| Handler 参数解析 | 其他 Handler 的相同模式 |
|
||||
| Service 业务逻辑 | 同模块其他方法的实现 |
|
||||
| Store SQL 查询 | 同 Store 文件中类似的查询 |
|
||||
| Redis 操作 | `pkg/constants/redis.go` 中的 Key 定义 |
|
||||
| 异步任务 | `internal/task/` 中其他任务处理器 |
|
||||
| GORM Callback | `pkg/database/` 中的 callback 实现 |
|
||||
|
||||
#### 2. 逐行对比
|
||||
|
||||
完整阅读参考代码,不要跳读。列出每一处差异。
|
||||
|
||||
#### 3. 不要假设"这个不重要"
|
||||
|
||||
小差异经常是 bug 的根因:
|
||||
- 字段标签 `gorm:"column:xxx"` 拼写不对
|
||||
- `errors.New()` 用了错误的错误码
|
||||
- Redis Key 函数参数传反了
|
||||
- Context 里的 UserID 没取到(中间件没配)
|
||||
|
||||
---
|
||||
|
||||
### 阶段三:假设和验证
|
||||
|
||||
**科学方法:一次只验证一个假设。**
|
||||
|
||||
#### 1. 形成单一假设
|
||||
|
||||
明确写下:
|
||||
|
||||
> "我认为根因是 X,因为 Y。验证方法是 Z。"
|
||||
|
||||
#### 2. 最小化验证
|
||||
|
||||
- 只改一个地方
|
||||
- 一次只验证一个变量
|
||||
- 不要同时修多处
|
||||
|
||||
#### 3. 验证结果
|
||||
|
||||
- 假设成立 → 进入阶段四
|
||||
- 假设不成立 → 回到阶段一,用新信息重新分析
|
||||
- **绝对不能在失败的修复上再叠加修复**
|
||||
|
||||
#### 4. 三次失败 → 停下来
|
||||
|
||||
如果连续 3 次假设都不成立:
|
||||
|
||||
**这不是 bug,是架构问题。**
|
||||
|
||||
- 停止一切修复尝试
|
||||
- 整理已知信息
|
||||
- 向用户说明情况,讨论是否需要重构
|
||||
- 不要再试第 4 次
|
||||
|
||||
---
|
||||
|
||||
### 阶段四:实施修复
|
||||
|
||||
**确认根因后,一次性修好。**
|
||||
|
||||
#### 1. 修根因,不修症状
|
||||
|
||||
```
|
||||
❌ 症状修复:在 Handler 里加个 if 把坏数据过滤掉
|
||||
✅ 根因修复:修 Service 层生成坏数据的逻辑
|
||||
```
|
||||
|
||||
#### 2. 一次只改一个地方
|
||||
|
||||
- 不搞"顺手优化"
|
||||
- 不在修 bug 的同时重构代码
|
||||
- 修完 bug 就停
|
||||
|
||||
#### 3. 验证修复
|
||||
|
||||
- `go build ./...` 编译通过
|
||||
- `lsp_diagnostics` 无新增错误
|
||||
- 用原来复现 bug 的请求再跑一次,确认修好了
|
||||
- 用 PostgreSQL MCP 工具检查数据库中的数据状态
|
||||
|
||||
#### 4. 清理诊断代码
|
||||
|
||||
- 删除阶段一加的临时诊断日志(除非它们本身就该保留)
|
||||
- 确保没有 `db.Debug()` 残留在代码里
|
||||
|
||||
---
|
||||
|
||||
## 本项目常见调试场景速查
|
||||
|
||||
| 场景 | 首先检查 |
|
||||
|------|---------|
|
||||
| API 返回 401 | `logs/access.log` 中该请求的 token → Redis 中 `auth:token:{token}` 是否存在 |
|
||||
| API 返回 403 | 用户类型是什么 → GORM Callback 自动过滤的条件对不对 → `middleware.CanManageShop()` 的参数 |
|
||||
| 数据查不到 | GORM 数据权限过滤有没有生效 → `shop_id` / `enterprise_id` 是否正确 → 是否需要 `SkipDataPermission` |
|
||||
| 金额/余额不对 | 乐观锁 version 字段 → `RowsAffected` 是否为 0 → 并发场景下的锁竞争 |
|
||||
| 状态流转错误 | `WHERE status = expected` 条件更新 → 状态机是否有遗漏的路径 |
|
||||
| 异步任务不执行 | Asynq Dashboard → `RedisTaskLockKey` 有没有残留 → Worker 日志 |
|
||||
| 异步任务重复执行 | `RedisTaskLockKey` 的 TTL → 任务幂等性检查 |
|
||||
| 分佣计算错误 | 佣金类型(差价/一次性) → 套餐级别的佣金率 → 设备级防重复分佣 |
|
||||
| 套餐激活异常 | 卡状态 → 实名状态 → 主套餐排队逻辑 → 加油包绑定关系 |
|
||||
| Redis 缓存不一致 | Key 的 TTL → 缓存更新时机 → 是否有手动 `Del` 清除 |
|
||||
| 微信支付回调失败 | 签名验证 → 幂等性处理 → 回调 URL 是否可达 |
|
||||
| GORM 查询慢 | `db.Debug()` 看实际 SQL → 是否 N+1 → 是否缺少索引 |
|
||||
|
||||
---
|
||||
|
||||
## 红线规则
|
||||
|
||||
如果你发现自己在想以下任何一条,**立刻停下来,回到阶段一**:
|
||||
|
||||
| 想法 | 为什么是错的 |
|
||||
|------|------------|
|
||||
| "先快速修一下,回头再查" | 快速修 = 猜测。猜测 = 浪费时间。 |
|
||||
| "试试改这个看看行不行" | 一次只验证一个假设,不是随机改。 |
|
||||
| "大概是 X 的问题,我直接改了" | "大概"不是根因。先验证再改。 |
|
||||
| "这个很简单,不用走流程" | 简单问题走流程只需要 5 分钟。不走流程可能浪费 2 小时。 |
|
||||
| "我不完全理解但这应该行" | 不理解 = 没找到根因。回阶段一。 |
|
||||
| "再试一次"(已经失败 2 次) | 3 次失败 = 架构问题。停下来讨论。 |
|
||||
| "同时改这几个地方应该能修好" | 改多处 = 无法确认哪个是根因。一次只改一处。 |
|
||||
|
||||
---
|
||||
|
||||
## 常见借口和真相
|
||||
|
||||
| 借口 | 真相 |
|
||||
|------|------|
|
||||
| "问题很简单,不需要走流程" | 简单问题也有根因。走流程对简单问题只花 5 分钟。 |
|
||||
| "太紧急了,没时间分析" | 系统化调试比乱猜快 3-5 倍。越急越要走流程。 |
|
||||
| "先改了验证一下" | 这叫猜测,不叫验证。先确认根因再改。 |
|
||||
| "我看到问题了,直接修" | 看到症状 ≠ 理解根因。症状修复是技术债。 |
|
||||
| "改了好几个地方,反正能用了" | 不知道哪个改动修的,下次还会出问题。 |
|
||||
|
||||
---
|
||||
|
||||
## 快速参考
|
||||
|
||||
| 阶段 | 核心动作 | 完成标准 |
|
||||
|------|---------|---------|
|
||||
| **一、根因调查** | 读错误日志、复现、检查改动、逐层诊断、追踪数据流 | 能说清楚"因为 X 所以 Y" |
|
||||
| **二、模式分析** | 找参照代码、逐行对比、列出差异 | 知道正确的应该长什么样 |
|
||||
| **三、假设验证** | 写下假设、最小改动、单变量验证 | 假设被证实或推翻 |
|
||||
| **四、实施修复** | 修根因、编译检查、请求验证、清理诊断代码 | bug 消失,无新增问题 |
|
||||
1
.claude/skills/tdd
Symbolic link
1
.claude/skills/tdd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/tdd
|
||||
1
.claude/skills/teach
Symbolic link
1
.claude/skills/teach
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/teach
|
||||
1
.claude/skills/to-issues
Symbolic link
1
.claude/skills/to-issues
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/to-issues
|
||||
1
.claude/skills/to-prd
Symbolic link
1
.claude/skills/to-prd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/to-prd
|
||||
1
.claude/skills/triage
Symbolic link
1
.claude/skills/triage
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/triage
|
||||
1
.claude/skills/write-a-skill
Symbolic link
1
.claude/skills/write-a-skill
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/write-a-skill
|
||||
1
.claude/skills/zoom-out
Symbolic link
1
.claude/skills/zoom-out
Symbolic link
@@ -0,0 +1 @@
|
||||
../../.agents/skills/zoom-out
|
||||
198
.codex/skills/export-datasource/SKILL.md
Normal file
198
.codex/skills/export-datasource/SKILL.md
Normal file
@@ -0,0 +1,198 @@
|
||||
---
|
||||
name: export-datasource
|
||||
description: Project-specific guide for implementing, modifying, or reviewing export data sources in junhong_cmp_fiber. Use when Codex needs to add a new export scene, extend filters or dynamic columns, register an export scene, change export task query behavior, or explain/debug the DataSource-based export system.
|
||||
---
|
||||
|
||||
# Export Datasource
|
||||
|
||||
Use this skill to work on this project's DataSource-based export system. It covers developer-facing export scene implementation, not one-off manual export operations.
|
||||
|
||||
## First Reads
|
||||
|
||||
Before editing export code, read the relevant current files:
|
||||
|
||||
- `internal/exporter/datasource.go`
|
||||
- `internal/exporter/query_params.go`
|
||||
- `internal/exporter/filter_helpers.go`
|
||||
- `internal/exporter/registry.go`
|
||||
- Existing scene closest to the new scene:
|
||||
- `internal/exporter/device_scene.go`
|
||||
- `internal/exporter/iot_card_scene.go`
|
||||
- For request/scene validation:
|
||||
- `internal/model/dto/export_task_dto.go`
|
||||
- `pkg/constants/constants.go`
|
||||
- For behavior across worker stages:
|
||||
- `internal/task/export_dispatch.go`
|
||||
- `internal/task/export_shard.go`
|
||||
- `internal/task/export_finalize.go`
|
||||
|
||||
Read `references/export-scene-template.md` when adding a new scene or when a concrete code skeleton is useful.
|
||||
|
||||
## Mental Model
|
||||
|
||||
The framework owns async execution, sharding, file generation, OSS upload, and download URLs. A scene implementation owns only data semantics:
|
||||
|
||||
```go
|
||||
type DataSource interface {
|
||||
Scene() string
|
||||
Count(ctx context.Context, params ExportParams) (int, error)
|
||||
Headers(ctx context.Context, params ExportParams) ([]string, error)
|
||||
Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error)
|
||||
}
|
||||
```
|
||||
|
||||
Execution flow:
|
||||
|
||||
1. Admin API creates `tb_export_task` and enqueues `export:dispatch`.
|
||||
2. Dispatch parses `query_json.filters` plus permission snapshot into `ExportParams`.
|
||||
3. Dispatch calls `Headers` once and stores `query_json.resolved_headers`.
|
||||
4. Dispatch calls `Count` and creates `tb_export_shard_task` rows with `shard_offset` and `shard_limit`.
|
||||
5. Shard calls `Fetch`, writes headerless CSV shard files, and uploads them.
|
||||
6. Finalize downloads shard CSV files in shard order, writes one header row, uploads final CSV or converts CSV to XLSX.
|
||||
|
||||
Do not reintroduce keyset cursor logic. New scenes must use offset/limit through `Fetch`.
|
||||
|
||||
## Implementation Workflow
|
||||
|
||||
1. Add a scene constant in `pkg/constants/constants.go`.
|
||||
2. Update `internal/model/dto/export_task_dto.go` validation and descriptions for `scene`.
|
||||
3. Implement `internal/exporter/<scene>_scene.go` with `DataSource`.
|
||||
4. Register the source in `NewDefaultRegistry`.
|
||||
5. Update `IsSupportedScene` if it is used by the current code path.
|
||||
6. Add or update migrations only if the exported domain needs schema/index changes. Do not change export task tables unless the framework contract changes.
|
||||
7. Build and manually verify. This repository forbids automated tests unless the user explicitly requests them.
|
||||
|
||||
## DataSource Rules
|
||||
|
||||
- `Scene` must return the constant, not a string literal.
|
||||
- `Count` and `Fetch` must apply the same filters and permission scope.
|
||||
- `Headers` defines the exact column contract for the whole task. Dispatch stores it once; shards and finalize reuse it.
|
||||
- `Fetch` must return rows aligned to `Headers`; the framework pads/truncates as a fallback, but the source should be correct.
|
||||
- `Fetch` must use stable ordering, normally `ORDER BY id ASC`.
|
||||
- Return string values only. Format time as `2006-01-02 15:04:05` unless the surrounding scene establishes another convention.
|
||||
- Use GORM only. Do not use `database/sql`.
|
||||
- Keep SQL parameters bound through GORM placeholders. Do not concatenate user-controlled values into SQL.
|
||||
- Keep comments, logs, errors, and documentation in Chinese per project rules.
|
||||
|
||||
## Filters And Permissions
|
||||
|
||||
Incoming task query shape:
|
||||
|
||||
```json
|
||||
{
|
||||
"filters": {
|
||||
"status": 1,
|
||||
"shop_id": 1
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
`ParseExportParams` exposes:
|
||||
|
||||
- `Filters`: `query_json.filters`
|
||||
- `ScopeShopIDs`: shop permission snapshot captured at task creation
|
||||
- `UserType`: creator user type snapshot
|
||||
|
||||
Apply permission scope inside each DataSource:
|
||||
|
||||
```go
|
||||
query = applyExportShopScope(query, params, "shop_id")
|
||||
```
|
||||
|
||||
For aliased queries:
|
||||
|
||||
```go
|
||||
query = applyExportShopScope(query, params, "o.shop_id")
|
||||
```
|
||||
|
||||
Use helpers from `filter_helpers.go`:
|
||||
|
||||
- `filterInt`
|
||||
- `filterUint`
|
||||
- `filterString`
|
||||
- `filterBool`
|
||||
- `filterTime`
|
||||
- `formatOptionalUint`
|
||||
- `formatOptionalTime`
|
||||
|
||||
Do not read live permissions from context inside a DataSource. Export tasks must use the permission snapshot stored at creation time.
|
||||
|
||||
## Dynamic Columns
|
||||
|
||||
Use dynamic headers only when the task parameters or data require it. If `Headers` changes based on filters, `Fetch` must produce the same shape for every shard under the same `ExportParams`.
|
||||
|
||||
Example pattern:
|
||||
|
||||
```go
|
||||
headers := []string{"ID", "ICCID", "状态"}
|
||||
if filterBool(params.Filters, "with_package") {
|
||||
headers = append(headers, "套餐名称", "套餐状态")
|
||||
}
|
||||
return headers, nil
|
||||
```
|
||||
|
||||
## Join Queries
|
||||
|
||||
JOIN-based exports are allowed. Keep these constraints:
|
||||
|
||||
- Preserve one output row per intended exported entity unless the scene explicitly exports detail rows.
|
||||
- If a JOIN can multiply rows, make `Count` match the exported row semantics exactly.
|
||||
- Use table aliases consistently in filters and scope columns.
|
||||
- Prefer explicit `Select` into a local row struct for multi-table exports.
|
||||
- Keep `Order`, `Limit`, and `Offset` on the final query used by `Fetch`.
|
||||
|
||||
## User-Facing API Notes
|
||||
|
||||
Current API group:
|
||||
|
||||
- `POST /api/admin/export-tasks`
|
||||
- `GET /api/admin/export-tasks`
|
||||
- `GET /api/admin/export-tasks/:id`
|
||||
- `POST /api/admin/export-tasks/:id/cancel`
|
||||
|
||||
Creation request:
|
||||
|
||||
```json
|
||||
{
|
||||
"scene": "iot_card",
|
||||
"format": "csv",
|
||||
"query": {
|
||||
"filters": {
|
||||
"shop_id": 1,
|
||||
"with_package": true
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Formats are `csv` and `xlsx`. Final download URLs are returned from task detail after completion.
|
||||
|
||||
## Verification
|
||||
|
||||
This project forbids automated tests and `_test.go` files unless the user explicitly asks for tests. Use manual verification:
|
||||
|
||||
```bash
|
||||
go build ./internal/exporter/...
|
||||
go build ./internal/task/...
|
||||
go build ./...
|
||||
```
|
||||
|
||||
Then create an export task through the API and inspect:
|
||||
|
||||
- `tb_export_task.query_json` contains original `filters` and generated `resolved_headers`.
|
||||
- `tb_export_task.total_rows` matches the filtered query.
|
||||
- `tb_export_shard_task.shard_offset` and `shard_limit` are filled.
|
||||
- Shards reach success and final task reaches completed status.
|
||||
- Downloaded file has one header row, expected row count, correct filtering, and valid CSV/XLSX format.
|
||||
|
||||
Use PostgreSQL MCP/manual SQL for data validation when needed.
|
||||
|
||||
## Common Mistakes
|
||||
|
||||
- Updating only `Fetch` and forgetting `Count`, causing wrong shard planning.
|
||||
- Returning dynamic rows whose column count does not match `Headers`.
|
||||
- Filtering by requested `shop_id` without also applying `ScopeShopIDs`.
|
||||
- Using context/user middleware inside worker DataSource logic.
|
||||
- Registering the source but forgetting DTO `oneof`, so API rejects the new scene.
|
||||
- Writing XLSX shard files. Shards should be CSV; finalize handles final format.
|
||||
- Adding automated tests despite the repository ban.
|
||||
4
.codex/skills/export-datasource/agents/openai.yaml
Normal file
4
.codex/skills/export-datasource/agents/openai.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
interface:
|
||||
display_name: "导出数据源开发"
|
||||
short_description: "指导新增和维护项目导出数据源场景"
|
||||
default_prompt: "Use $export-datasource to add a new export scene for this project."
|
||||
@@ -0,0 +1,222 @@
|
||||
# Export Scene Template
|
||||
|
||||
Use this reference when adding a new export scene.
|
||||
|
||||
## Minimal Checklist
|
||||
|
||||
- Add `ExportTaskSceneXxx` in `pkg/constants/constants.go`.
|
||||
- Add the scene to `CreateExportTaskRequest.Scene` and `ListExportTaskRequest.Scene` validation/description.
|
||||
- Create `internal/exporter/<scene>_scene.go`.
|
||||
- Register `NewXxxDataSource(db)` in `internal/exporter/registry.go`.
|
||||
- Update `IsSupportedScene`.
|
||||
- Run `gofmt` on changed Go files.
|
||||
- Run `go build ./internal/exporter/...`, `go build ./internal/task/...`, and `go build ./...`.
|
||||
- Manually create a task and validate database rows plus downloaded file.
|
||||
|
||||
## Skeleton
|
||||
|
||||
```go
|
||||
package exporter
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strconv"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
)
|
||||
|
||||
// XxxDataSource Xxx 导出数据源。
|
||||
type XxxDataSource struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
// NewXxxDataSource 创建 Xxx 导出数据源。
|
||||
func NewXxxDataSource(db *gorm.DB) *XxxDataSource {
|
||||
return &XxxDataSource{db: db}
|
||||
}
|
||||
|
||||
// Scene 返回导出场景编码。
|
||||
func (s *XxxDataSource) Scene() string {
|
||||
return constants.ExportTaskSceneXxx
|
||||
}
|
||||
|
||||
// Count 统计 Xxx 导出行数。
|
||||
func (s *XxxDataSource) Count(ctx context.Context, params ExportParams) (int, error) {
|
||||
var total int64
|
||||
query := s.applyFilters(s.db.WithContext(ctx).Model(&model.Xxx{}), params)
|
||||
if err := query.Count(&total).Error; err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return int(total), nil
|
||||
}
|
||||
|
||||
// Headers 返回 Xxx 导出表头。
|
||||
func (s *XxxDataSource) Headers(ctx context.Context, params ExportParams) ([]string, error) {
|
||||
return []string{"ID", "名称", "状态", "店铺ID", "创建时间"}, nil
|
||||
}
|
||||
|
||||
// Fetch 按 offset/limit 查询 Xxx 导出数据。
|
||||
func (s *XxxDataSource) Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error) {
|
||||
if limit <= 0 {
|
||||
return [][]string{}, nil
|
||||
}
|
||||
|
||||
var items []model.Xxx
|
||||
query := s.applyFilters(s.db.WithContext(ctx).Model(&model.Xxx{}), params).
|
||||
Order("id ASC").
|
||||
Limit(limit).
|
||||
Offset(offset)
|
||||
if err := query.Find(&items).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows := make([][]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
rows = append(rows, []string{
|
||||
strconv.FormatUint(uint64(item.ID), 10),
|
||||
item.Name,
|
||||
strconv.Itoa(item.Status),
|
||||
formatOptionalUint(item.ShopID),
|
||||
item.CreatedAt.Format(exportTimeLayout),
|
||||
})
|
||||
}
|
||||
return rows, nil
|
||||
}
|
||||
|
||||
func (s *XxxDataSource) applyFilters(query *gorm.DB, params ExportParams) *gorm.DB {
|
||||
query = applyExportShopScope(query, params, "shop_id")
|
||||
|
||||
if status, ok := filterInt(params.Filters, "status"); ok {
|
||||
query = query.Where("status = ?", status)
|
||||
}
|
||||
if shopID, ok := filterUint(params.Filters, "shop_id"); ok {
|
||||
query = query.Where("shop_id = ?", shopID)
|
||||
}
|
||||
if start, ok := filterTime(params.Filters, "created_at_start"); ok {
|
||||
query = query.Where("created_at >= ?", start)
|
||||
}
|
||||
if end, ok := filterTime(params.Filters, "created_at_end"); ok {
|
||||
query = query.Where("created_at <= ?", end)
|
||||
}
|
||||
return query
|
||||
}
|
||||
```
|
||||
|
||||
## JOIN Skeleton
|
||||
|
||||
Use this shape for multi-table exports:
|
||||
|
||||
```go
|
||||
type xxxExportRow struct {
|
||||
ID uint
|
||||
Name string
|
||||
Status int
|
||||
ShopID *uint
|
||||
ExtraName string
|
||||
CreatedAt time.Time
|
||||
}
|
||||
|
||||
func (s *XxxDataSource) Fetch(ctx context.Context, params ExportParams, offset, limit int) ([][]string, error) {
|
||||
if limit <= 0 {
|
||||
return [][]string{}, nil
|
||||
}
|
||||
|
||||
var items []xxxExportRow
|
||||
query := s.applyFilters(s.db.WithContext(ctx).Table("tb_xxx AS x"), params, "x.").
|
||||
Select(`
|
||||
x.id,
|
||||
x.name,
|
||||
x.status,
|
||||
x.shop_id,
|
||||
COALESCE(e.name, '') AS extra_name,
|
||||
x.created_at
|
||||
`).
|
||||
Joins("LEFT JOIN tb_extra AS e ON e.xxx_id = x.id AND e.deleted_at IS NULL").
|
||||
Where("x.deleted_at IS NULL").
|
||||
Order("x.id ASC").
|
||||
Limit(limit).
|
||||
Offset(offset)
|
||||
if err := query.Scan(&items).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows := make([][]string, 0, len(items))
|
||||
for _, item := range items {
|
||||
rows = append(rows, []string{
|
||||
strconv.FormatUint(uint64(item.ID), 10),
|
||||
item.Name,
|
||||
strconv.Itoa(item.Status),
|
||||
formatOptionalUint(item.ShopID),
|
||||
item.ExtraName,
|
||||
item.CreatedAt.Format(exportTimeLayout),
|
||||
})
|
||||
}
|
||||
return rows, nil
|
||||
}
|
||||
|
||||
func (s *XxxDataSource) applyFilters(query *gorm.DB, params ExportParams, prefix string) *gorm.DB {
|
||||
query = applyExportShopScope(query, params, prefix+"shop_id")
|
||||
if status, ok := filterInt(params.Filters, "status"); ok {
|
||||
query = query.Where(prefix+"status = ?", status)
|
||||
}
|
||||
return query
|
||||
}
|
||||
```
|
||||
|
||||
If the JOIN multiplies rows, update `Count` to count the same exported row set. Do not count only the base table unless `Fetch` also returns one row per base record.
|
||||
|
||||
## Registry Patch
|
||||
|
||||
```go
|
||||
func NewDefaultRegistry(db *gorm.DB) *Registry {
|
||||
return NewRegistry(
|
||||
NewDeviceDataSource(db),
|
||||
NewIotCardDataSource(db),
|
||||
NewXxxDataSource(db),
|
||||
)
|
||||
}
|
||||
|
||||
func IsSupportedScene(scene string) bool {
|
||||
switch scene {
|
||||
case constants.ExportTaskSceneDevice,
|
||||
constants.ExportTaskSceneIotCard,
|
||||
constants.ExportTaskSceneXxx:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Manual API Smoke
|
||||
|
||||
```bash
|
||||
curl -X POST 'http://localhost:端口/api/admin/export-tasks' \
|
||||
-H 'Authorization: Bearer <token>' \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d '{
|
||||
"scene": "xxx",
|
||||
"format": "csv",
|
||||
"query": {
|
||||
"filters": {
|
||||
"status": 1
|
||||
}
|
||||
}
|
||||
}'
|
||||
```
|
||||
|
||||
Check database:
|
||||
|
||||
```sql
|
||||
SELECT id, scene, format, status, total_rows, total_shards, query_json
|
||||
FROM tb_export_task
|
||||
WHERE id = <task_id>;
|
||||
|
||||
SELECT shard_no, status, shard_offset, shard_limit, row_count, file_key
|
||||
FROM tb_export_shard_task
|
||||
WHERE task_id = <task_id>
|
||||
ORDER BY shard_no;
|
||||
```
|
||||
@@ -1,7 +1,20 @@
|
||||
[[sources]]
|
||||
id = "main"
|
||||
description = "当前项目库"
|
||||
dsn = "postgresql://erp_pgsql:erp_2025@cxd.whcxd.cn:16159/junhong_cmp_test?sslmode=disable"
|
||||
|
||||
[[sources]]
|
||||
id = "legacy_mysql"
|
||||
description = "老系统 MySQL 库,仅用于 AI 查询和迁移脚本准备"
|
||||
type = "mysql"
|
||||
host = "120.79.89.216"
|
||||
port = 3306
|
||||
database = "kyhl"
|
||||
user = "root"
|
||||
password = "XiWaJ9Eu%go9-2>g!xGp"
|
||||
sslmode = "disable"
|
||||
lazy = true
|
||||
|
||||
[[tools]]
|
||||
name = "search_objects"
|
||||
source = "main"
|
||||
@@ -11,3 +24,13 @@ name = "execute_sql"
|
||||
source = "main"
|
||||
readonly = true # Only allow SELECT, SHOW, DESCRIBE, EXPLAIN
|
||||
max_rows = 1000 # Limit query results
|
||||
|
||||
[[tools]]
|
||||
name = "search_objects"
|
||||
source = "legacy_mysql"
|
||||
|
||||
[[tools]]
|
||||
name = "execute_sql"
|
||||
source = "legacy_mysql"
|
||||
readonly = true # Only allow SELECT, SHOW, DESCRIBE, EXPLAIN
|
||||
max_rows = 5000 # Limit query results for migration exploration
|
||||
|
||||
25
.gitignore
vendored
25
.gitignore
vendored
@@ -85,3 +85,28 @@ docs/admin-openapi.yaml
|
||||
.opencode/skills/kb-sync
|
||||
.gitignore
|
||||
.opencode/skills/defuddle
|
||||
# CocoIndex Code (ccc)
|
||||
/.cocoindex_code/
|
||||
.omx/hud-config.json
|
||||
.omx/metrics.json
|
||||
.omx/setup-scope.json
|
||||
.omx/cache/codebase-map.json
|
||||
.omx/state/current-task-baseline.json
|
||||
.omx/state/notify-fallback-authority-owner.json
|
||||
.omx/state/notify-fallback-state.json
|
||||
.omx/state/notify-fallback.pid
|
||||
.omx/state/session.json
|
||||
.omx/state/subagent-tracking.json
|
||||
.omx/state/team-leader-nudge.json
|
||||
.omx/state/tmux-hook-state.json
|
||||
.omx/state/update-check.json
|
||||
.omx/state/sessions/omx-1777517355305-tzivrd/AGENTS.md
|
||||
.omx/state/sessions/omx-1777517355305-tzivrd/hud-state.json
|
||||
.omx/state/sessions/omx-1777517489966-oo3g37/AGENTS.md
|
||||
.omx/state/sessions/omx-1777517489966-oo3g37/hud-state.json
|
||||
.omx/state/sessions/omx-1777517489966-oo3g37/notify-hook-state.json
|
||||
.omx/state/tmux-extended-keys/private-tmp-tmux-501-default.json
|
||||
.aider*
|
||||
|
||||
# /teach skill 的个人学习工作区,不进入项目提交历史
|
||||
.claude/teach-workspace/
|
||||
|
||||
@@ -1,265 +0,0 @@
|
||||
---
|
||||
name: systematic-debugging
|
||||
description: 遇到任何 bug、异常行为、报错时必须使用。在提出任何修复方案之前,强制执行根因分析流程。适用于 API 报错、数据异常、业务逻辑错误、性能问题等所有技术问题。
|
||||
license: MIT
|
||||
metadata:
|
||||
author: junhong
|
||||
version: "1.0"
|
||||
source: "adapted from obra/superpowers systematic-debugging"
|
||||
---
|
||||
|
||||
# 系统化调试方法论
|
||||
|
||||
## 铁律
|
||||
|
||||
```
|
||||
没有找到根因,禁止提出任何修复方案。
|
||||
```
|
||||
|
||||
改之前先搞懂为什么坏了。猜测不是调试,验证假设才是。
|
||||
|
||||
---
|
||||
|
||||
## 什么时候用
|
||||
|
||||
**所有技术问题都用这个流程**:
|
||||
- API 接口报错(4xx / 5xx)
|
||||
- 业务数据异常(金额不对、状态流转错误)
|
||||
- 性能问题(接口慢、数据库慢查询)
|
||||
- 异步任务失败(Asynq 任务报错/卡住)
|
||||
- 构建失败、启动失败
|
||||
|
||||
**尤其是以下场景**:
|
||||
- 时间紧迫(越急越不能瞎猜)
|
||||
- "很简单的问题"(简单问题也有根因)
|
||||
- 已经试了一次修复但没解决
|
||||
- 不完全理解为什么出问题
|
||||
|
||||
---
|
||||
|
||||
## 四阶段流程
|
||||
|
||||
必须按顺序完成每个阶段,不可跳过。
|
||||
|
||||
### 阶段一:根因调查
|
||||
|
||||
**这是最重要的阶段,占整个调试时间的 60%。没完成本阶段,禁止进入阶段二。**
|
||||
|
||||
#### 1. 仔细阅读错误信息
|
||||
|
||||
- 完整阅读 stack trace,不要跳过
|
||||
- 注意行号、文件路径、错误码
|
||||
- 很多时候答案就在错误信息里
|
||||
- 检查 `logs/app.log` 和 `logs/access.log` 中的上下文
|
||||
|
||||
#### 2. 稳定复现
|
||||
|
||||
- 能稳定触发吗?精确的请求参数是什么?
|
||||
- 用 curl 或 Postman 复现,记录完整的请求和响应
|
||||
- 不能复现 → 收集更多数据(检查日志、Redis 状态、数据库记录),**不要瞎猜**
|
||||
|
||||
#### 3. 检查最近改动
|
||||
|
||||
- `git diff` / `git log --oneline -10` 看最近改了什么
|
||||
- 新加了什么依赖?改了什么配置?改了什么 SQL?
|
||||
- 对比改动前后的行为差异
|
||||
|
||||
#### 4. 逐层诊断(针对本项目架构)
|
||||
|
||||
本项目有明确的分层架构,问题一定出在某一层的边界:
|
||||
|
||||
```
|
||||
请求 → Fiber Middleware → Handler → Service → Store → PostgreSQL/Redis
|
||||
↑ ↑ ↑ ↑ ↑
|
||||
认证/限流 参数解析 业务逻辑 SQL/缓存 数据本身
|
||||
```
|
||||
|
||||
**在每个层边界确认数据是否正确**:
|
||||
|
||||
```go
|
||||
// Handler 层 — 请求进来的参数对不对?
|
||||
logger.Info("Handler 收到请求",
|
||||
zap.Any("params", req),
|
||||
zap.String("request_id", requestID),
|
||||
)
|
||||
|
||||
// Service 层 — 传给业务逻辑的数据对不对?
|
||||
logger.Info("Service 开始处理",
|
||||
zap.Uint("user_id", userID),
|
||||
zap.Any("input", input),
|
||||
)
|
||||
|
||||
// Store 层 — SQL 查询/写入的数据对不对?
|
||||
// 开启 GORM Debug 模式查看实际 SQL
|
||||
db.Debug().Where(...).Find(&result)
|
||||
|
||||
// Redis 层 — 缓存的数据对不对?
|
||||
// 用 redis-cli 直接检查 key 的值
|
||||
// GET auth:token:{token}
|
||||
// GET sim:status:{iccid}
|
||||
```
|
||||
|
||||
**跑一次 → 看日志 → 找到断裂的那一层 → 再深入该层排查。**
|
||||
|
||||
#### 5. 追踪数据流
|
||||
|
||||
如果错误深藏在调用链中:
|
||||
- 坏数据从哪来的?
|
||||
- 谁调用了这个函数,传了什么参数?
|
||||
- 一直往上追,直到找到数据变坏的源头
|
||||
- **修源头,不修症状**
|
||||
|
||||
---
|
||||
|
||||
### 阶段二:模式分析
|
||||
|
||||
**找到参照物,对比差异。**
|
||||
|
||||
#### 1. 找能用的参照
|
||||
|
||||
项目里有没有类似的、能正常工作的代码?
|
||||
|
||||
| 如果问题在... | 参照物在... |
|
||||
|-------------|-----------|
|
||||
| Handler 参数解析 | 其他 Handler 的相同模式 |
|
||||
| Service 业务逻辑 | 同模块其他方法的实现 |
|
||||
| Store SQL 查询 | 同 Store 文件中类似的查询 |
|
||||
| Redis 操作 | `pkg/constants/redis.go` 中的 Key 定义 |
|
||||
| 异步任务 | `internal/task/` 中其他任务处理器 |
|
||||
| GORM Callback | `pkg/database/` 中的 callback 实现 |
|
||||
|
||||
#### 2. 逐行对比
|
||||
|
||||
完整阅读参考代码,不要跳读。列出每一处差异。
|
||||
|
||||
#### 3. 不要假设"这个不重要"
|
||||
|
||||
小差异经常是 bug 的根因:
|
||||
- 字段标签 `gorm:"column:xxx"` 拼写不对
|
||||
- `errors.New()` 用了错误的错误码
|
||||
- Redis Key 函数参数传反了
|
||||
- Context 里的 UserID 没取到(中间件没配)
|
||||
|
||||
---
|
||||
|
||||
### 阶段三:假设和验证
|
||||
|
||||
**科学方法:一次只验证一个假设。**
|
||||
|
||||
#### 1. 形成单一假设
|
||||
|
||||
明确写下:
|
||||
|
||||
> "我认为根因是 X,因为 Y。验证方法是 Z。"
|
||||
|
||||
#### 2. 最小化验证
|
||||
|
||||
- 只改一个地方
|
||||
- 一次只验证一个变量
|
||||
- 不要同时修多处
|
||||
|
||||
#### 3. 验证结果
|
||||
|
||||
- 假设成立 → 进入阶段四
|
||||
- 假设不成立 → 回到阶段一,用新信息重新分析
|
||||
- **绝对不能在失败的修复上再叠加修复**
|
||||
|
||||
#### 4. 三次失败 → 停下来
|
||||
|
||||
如果连续 3 次假设都不成立:
|
||||
|
||||
**这不是 bug,是架构问题。**
|
||||
|
||||
- 停止一切修复尝试
|
||||
- 整理已知信息
|
||||
- 向用户说明情况,讨论是否需要重构
|
||||
- 不要再试第 4 次
|
||||
|
||||
---
|
||||
|
||||
### 阶段四:实施修复
|
||||
|
||||
**确认根因后,一次性修好。**
|
||||
|
||||
#### 1. 修根因,不修症状
|
||||
|
||||
```
|
||||
❌ 症状修复:在 Handler 里加个 if 把坏数据过滤掉
|
||||
✅ 根因修复:修 Service 层生成坏数据的逻辑
|
||||
```
|
||||
|
||||
#### 2. 一次只改一个地方
|
||||
|
||||
- 不搞"顺手优化"
|
||||
- 不在修 bug 的同时重构代码
|
||||
- 修完 bug 就停
|
||||
|
||||
#### 3. 验证修复
|
||||
|
||||
- `go build ./...` 编译通过
|
||||
- `lsp_diagnostics` 无新增错误
|
||||
- 用原来复现 bug 的请求再跑一次,确认修好了
|
||||
- 用 PostgreSQL MCP 工具检查数据库中的数据状态
|
||||
|
||||
#### 4. 清理诊断代码
|
||||
|
||||
- 删除阶段一加的临时诊断日志(除非它们本身就该保留)
|
||||
- 确保没有 `db.Debug()` 残留在代码里
|
||||
|
||||
---
|
||||
|
||||
## 本项目常见调试场景速查
|
||||
|
||||
| 场景 | 首先检查 |
|
||||
|------|---------|
|
||||
| API 返回 401 | `logs/access.log` 中该请求的 token → Redis 中 `auth:token:{token}` 是否存在 |
|
||||
| API 返回 403 | 用户类型是什么 → GORM Callback 自动过滤的条件对不对 → `middleware.CanManageShop()` 的参数 |
|
||||
| 数据查不到 | GORM 数据权限过滤有没有生效 → `shop_id` / `enterprise_id` 是否正确 → 是否需要 `SkipDataPermission` |
|
||||
| 金额/余额不对 | 乐观锁 version 字段 → `RowsAffected` 是否为 0 → 并发场景下的锁竞争 |
|
||||
| 状态流转错误 | `WHERE status = expected` 条件更新 → 状态机是否有遗漏的路径 |
|
||||
| 异步任务不执行 | Asynq Dashboard → `RedisTaskLockKey` 有没有残留 → Worker 日志 |
|
||||
| 异步任务重复执行 | `RedisTaskLockKey` 的 TTL → 任务幂等性检查 |
|
||||
| 分佣计算错误 | 佣金类型(差价/一次性) → 套餐级别的佣金率 → 设备级防重复分佣 |
|
||||
| 套餐激活异常 | 卡状态 → 实名状态 → 主套餐排队逻辑 → 加油包绑定关系 |
|
||||
| Redis 缓存不一致 | Key 的 TTL → 缓存更新时机 → 是否有手动 `Del` 清除 |
|
||||
| 微信支付回调失败 | 签名验证 → 幂等性处理 → 回调 URL 是否可达 |
|
||||
| GORM 查询慢 | `db.Debug()` 看实际 SQL → 是否 N+1 → 是否缺少索引 |
|
||||
|
||||
---
|
||||
|
||||
## 红线规则
|
||||
|
||||
如果你发现自己在想以下任何一条,**立刻停下来,回到阶段一**:
|
||||
|
||||
| 想法 | 为什么是错的 |
|
||||
|------|------------|
|
||||
| "先快速修一下,回头再查" | 快速修 = 猜测。猜测 = 浪费时间。 |
|
||||
| "试试改这个看看行不行" | 一次只验证一个假设,不是随机改。 |
|
||||
| "大概是 X 的问题,我直接改了" | "大概"不是根因。先验证再改。 |
|
||||
| "这个很简单,不用走流程" | 简单问题走流程只需要 5 分钟。不走流程可能浪费 2 小时。 |
|
||||
| "我不完全理解但这应该行" | 不理解 = 没找到根因。回阶段一。 |
|
||||
| "再试一次"(已经失败 2 次) | 3 次失败 = 架构问题。停下来讨论。 |
|
||||
| "同时改这几个地方应该能修好" | 改多处 = 无法确认哪个是根因。一次只改一处。 |
|
||||
|
||||
---
|
||||
|
||||
## 常见借口和真相
|
||||
|
||||
| 借口 | 真相 |
|
||||
|------|------|
|
||||
| "问题很简单,不需要走流程" | 简单问题也有根因。走流程对简单问题只花 5 分钟。 |
|
||||
| "太紧急了,没时间分析" | 系统化调试比乱猜快 3-5 倍。越急越要走流程。 |
|
||||
| "先改了验证一下" | 这叫猜测,不叫验证。先确认根因再改。 |
|
||||
| "我看到问题了,直接修" | 看到症状 ≠ 理解根因。症状修复是技术债。 |
|
||||
| "改了好几个地方,反正能用了" | 不知道哪个改动修的,下次还会出问题。 |
|
||||
|
||||
---
|
||||
|
||||
## 快速参考
|
||||
|
||||
| 阶段 | 核心动作 | 完成标准 |
|
||||
|------|---------|---------|
|
||||
| **一、根因调查** | 读错误日志、复现、检查改动、逐层诊断、追踪数据流 | 能说清楚"因为 X 所以 Y" |
|
||||
| **二、模式分析** | 找参照代码、逐行对比、列出差异 | 知道正确的应该长什么样 |
|
||||
| **三、假设验证** | 写下假设、最小改动、单变量验证 | 假设被证实或推翻 |
|
||||
| **四、实施修复** | 修根因、编译检查、请求验证、清理诊断代码 | bug 消失,无新增问题 |
|
||||
126
.scratch/customer-binding-architecture/PRD.md
Normal file
126
.scratch/customer-binding-architecture/PRD.md
Normal file
@@ -0,0 +1,126 @@
|
||||
Status: ready-for-agent
|
||||
|
||||
# PRD:客户绑定体系重构与资产归属验证统一
|
||||
|
||||
## Problem Statement
|
||||
|
||||
C 端用户在使用没有虚拟号的 IoT 卡时,整个业务流程完全失效:登录后无法实名认证、无法购买套餐、无法操作设备。根本原因是系统的客户绑定机制依赖虚拟号(`virtual_no`)作为唯一标识,而虚拟号在 IoT 卡上是可选字段,线上有 12,000+ 张无虚拟号的卡且确认会流向 C 端用户。
|
||||
|
||||
与此同时,换货流程在旧卡有虚拟号、新卡无虚拟号时会被错误拦截,即使旧卡实际上没有任何客户绑定记录,换货依然报错"新资产无法承接客户绑定"。
|
||||
|
||||
从设计层面看,`tb_personal_customer_iccid` 表(按 ICCID 绑定)早已建好,Store 层也实现完整,但从未被任何 Service 或 Handler 接入。同时,"判断某张卡/设备是否属于某个客户"这个核心安全规则,散落在 6 个文件中以 4 种不同方式实现,部分实现缺少对已禁用绑定记录的过滤,存在安全缺口。
|
||||
|
||||
## Solution
|
||||
|
||||
建立统一的 **CustomerBinding 模块**,封装客户与资产之间的绑定创建和归属验证逻辑,屏蔽"有虚拟号走 `tb_personal_customer_device` / 无虚拟号走 `tb_personal_customer_iccid`"的路由细节。所有调用方只需传入资产信息,不感知底层用了哪张表。
|
||||
|
||||
在此基础上,修复换货服务中校验与执行逻辑混淆的 bug,并将资产解析和 IoT 卡状态字段整理为后续阶段任务。
|
||||
|
||||
## User Stories
|
||||
|
||||
### C 端用户(无虚拟号的卡)
|
||||
|
||||
1. 作为一个持有无虚拟号 IoT 卡的 C 端用户,我想在首次登录时成功绑定我的卡,以便后续能正常使用所有 C 端功能。
|
||||
2. 作为一个持有无虚拟号 IoT 卡的 C 端用户,我想在绑定卡后能正常提交实名认证,以便激活卡的完整功能。
|
||||
3. 作为一个持有无虚拟号 IoT 卡的 C 端用户,我想购买流量套餐,以便为我的卡充值续费。
|
||||
4. 作为一个持有无虚拟号 IoT 卡的 C 端用户,我想在换货后仍能访问新卡并正常操作,以便换货不影响我的使用体验。
|
||||
|
||||
### C 端用户(有虚拟号的卡)
|
||||
|
||||
5. 作为一个持有有虚拟号 IoT 卡的 C 端用户,我的所有现有功能不受本次改动影响,以便升级对我透明无感知。
|
||||
6. 作为一个持有有虚拟号 IoT 卡的 C 端用户,当我的绑定关系被禁用后,我不能通过该绑定关系访问资产,以便系统安全边界得到保障。
|
||||
|
||||
### 后台运营人员(换货)
|
||||
|
||||
7. 作为后台运营人员,我想将一张有虚拟号的旧卡换货为一张无虚拟号的新卡,并且换货能正常完成,以便不再因无虚拟号而被系统错误拦截。
|
||||
8. 作为后台运营人员,当旧卡有客户绑定记录、新卡无虚拟号时,我希望系统在换货完成后自动将客户绑定迁移到新卡的 ICCID,以便客户换货后仍能访问新卡。
|
||||
9. 作为后台运营人员,当旧卡没有任何客户绑定记录时,无论旧卡是否有虚拟号,换货都应该正常完成,以便换货流程不被无意义的条件拦截。
|
||||
|
||||
### 系统(数据一致性)
|
||||
|
||||
10. 作为系统,当客户首次绑定一张无虚拟号的卡时,应正确将该卡的 `asset_status` 从在库更新为已销售,以便轮询系统能感知到该卡有真实用户在使用。
|
||||
11. 作为系统,当客户的绑定关系被禁用(`status=0`)后,归属验证应拒绝该客户访问对应资产,以便被撤销的绑定不再赋予访问权限。
|
||||
|
||||
## Implementation Decisions
|
||||
|
||||
### 1. 新增 CustomerBinding 模块
|
||||
|
||||
在 `internal/service/` 下建立 `customer_binding` 包,对外暴露两个核心接口:
|
||||
|
||||
- `Bind(ctx, tx, customerID, assetType, assetID)` — 创建或更新客户与资产的绑定关系;对于卡资产,有虚拟号写 `tb_personal_customer_device`,无虚拟号写 `tb_personal_customer_iccid`
|
||||
- `OwnsAsset(ctx, customerID, assetType, assetID) bool` — 验证客户是否持有该资产的有效绑定(`status=1`);按资产类型路由到对应绑定表查询
|
||||
- `Migrate(ctx, tx, oldAsset, newAsset)` — 换货时迁移绑定关系;处理四种组合(有→有、有→无、无→有、无→无)
|
||||
|
||||
`OwnsAsset` 内部统一强制 `status=1` 过滤,解决当前部分实现缺少此过滤的安全缺口。
|
||||
|
||||
### 2. 绑定路由规则(卡资产)
|
||||
|
||||
| 旧卡 | 新卡 | Migrate 行为 |
|
||||
|------|------|-------------|
|
||||
| 有虚拟号,有 pcd 绑定 | 有虚拟号 | 更新 pcd 记录的 virtual_no |
|
||||
| 有虚拟号,有 pcd 绑定 | 无虚拟号 | 禁用旧 pcd 记录 + 创建 pci ICCID 绑定 |
|
||||
| 有虚拟号,无绑定 | 无虚拟号 | 跳过(无需迁移) |
|
||||
| 无虚拟号 | 任意 | 迁移 pci 记录(若存在)到新卡 ICCID |
|
||||
|
||||
### 3. 接入 CustomerBinding 的调用点
|
||||
|
||||
以下调用点需要替换为 CustomerBinding 模块:
|
||||
|
||||
- `client_auth/service.go: bindAsset()` — 使用 `CustomerBinding.Bind()`
|
||||
- `client_auth/service.go: resolveAssetBindingKey()` — 废弃,逻辑内聚到 CustomerBinding
|
||||
- `handler/app/client_realname.go: ExistsByCustomerAndDevice()` — 替换为 `CustomerBinding.OwnsAsset()`
|
||||
- `handler/app/client_device.go: ExistsByCustomerAndDevice()` — 替换为 `CustomerBinding.OwnsAsset()`
|
||||
- `handler/app/client_wallet.go: isCustomerOwnAsset()` — 替换为 `CustomerBinding.OwnsAsset()`
|
||||
- `handler/app/client_asset.go: isCustomerOwnAsset()` — 替换为 `CustomerBinding.OwnsAsset()`
|
||||
- `service/client_order/service.go: checkAssetOwnership()` — 替换为 `CustomerBinding.OwnsAsset()`
|
||||
- `service/exchange/service.go: switchCustomerBindingWithTx()` — 替换为 `CustomerBinding.Migrate()`
|
||||
|
||||
### 4. 修复 switchCustomerBindingWithTx 的校验混淆
|
||||
|
||||
当前 `switchCustomerBindingWithTx`(执行函数)在执行阶段重复做了 `ensureNewAssetBindingAvailableWithTx`(校验函数)的判断,且条件更严(不查实际记录数,只看 key 是否为空)。
|
||||
|
||||
修复方式:将 `switchCustomerBindingWithTx` 改为调用 `CustomerBinding.Migrate()`,移除函数内的 `newKey==""` 拦截逻辑。`ensureNewAssetBindingAvailableWithTx` 同步更新:当 `newKey==""` 时,不再拦截,因为 `Migrate()` 已能正确处理此情形。
|
||||
|
||||
### 5. asset_status 首销标记修复
|
||||
|
||||
`bindAsset` 中通过 `firstEverBind`(查 `virtual_no=""` 的记录数)来判断是否首次绑定并触发 `markAssetAsSold()`。无虚拟号的卡因为 key 为空,导致此逻辑失效,`asset_status` 永远停在在库。
|
||||
|
||||
修复方式:在 `CustomerBinding.Bind()` 内,对 IoT 卡分别按各自绑定表查询首绑状态,再触发 `markAssetAsSold()`。
|
||||
|
||||
### 6. 不引入新的数据库表或字段
|
||||
|
||||
`tb_personal_customer_iccid` 表和 `PersonalCustomerICCIDStore` 已经存在且完整,本次只是接入,不需要迁移或 schema 变更。
|
||||
|
||||
### 7. 现有 personal_customer_device 数据不迁移
|
||||
|
||||
有虚拟号的卡现有绑定数据保持不变,继续走 `tb_personal_customer_device` 路径。只有无虚拟号的卡新登录时才写 `tb_personal_customer_iccid`。
|
||||
|
||||
## Testing Decisions
|
||||
|
||||
本项目禁止自动化测试,使用 PostgreSQL MCP 和 Postman/curl 手动验证。
|
||||
|
||||
**验证重点场景:**
|
||||
|
||||
1. **无虚拟号卡首次登录**:用无虚拟号卡的 ICCID 登录后,`tb_personal_customer_iccid` 应出现绑定记录,`tb_iot_card.asset_status` 应变为 2(已销售)
|
||||
2. **无虚拟号卡归属验证**:登录后调用实名认证接口,应返回成功而非"无权限"
|
||||
3. **无虚拟号卡购买套餐**:购买套餐接口应正常通过归属验证
|
||||
4. **有虚拟号换无虚拟号(旧卡有绑定)**:换货完成后,`tb_personal_customer_device` 旧记录 status 应为 0,`tb_personal_customer_iccid` 应出现新卡 ICCID 的绑定记录
|
||||
5. **有虚拟号换无虚拟号(旧卡无绑定)**:换货应正常完成,无报错,不写入任何绑定记录
|
||||
6. **有虚拟号换有虚拟号(回归)**:现有流程不受影响,pcd 表记录的 virtual_no 正确更新到新卡
|
||||
7. **禁用绑定后归属验证**:将某条 pcd 或 pci 记录 status 设为 0,对应客户调用归属验证应返回无权限
|
||||
8. **有虚拟号卡回归(全流程)**:确认有虚拟号卡的登录、实名、购买套餐流程无任何变化
|
||||
|
||||
## Out of Scope
|
||||
|
||||
- **IoT 卡状态字段整理**(`status` / `asset_status` / `activation_status` 语义重叠问题):影响面广,单独规划
|
||||
- **资产解析函数统一**(12 个 resolve 变体合并):不影响当前 bug,单独规划
|
||||
- **`tb_personal_customer_iccid` 换货迁移的历史数据回填**:历史上无虚拟号卡的用户无绑定记录,不做回填,用户需重新登录
|
||||
- **`tb_personal_customer_device` 中 `virtual_no=""` 的历史垃圾数据清理**:需先确认实际数量(SQL 查询),作为独立数据修复任务
|
||||
|
||||
## Further Notes
|
||||
|
||||
- 线上有 12,000+ 张无虚拟号的 IoT 卡,这是合法业务数据,不是数据质量问题
|
||||
- `tb_personal_customer_iccid` 的 Store 已有完整的 CRUD 实现(Create、ExistsByCustomerAndICCID、GetByCustomerID、CreateOrUpdateLastUsed 等),无需重写
|
||||
- 换货 bug 的直接触发路径:`completeExchangeWithTx → switchCustomerBindingWithTx`,在执行阶段因 `newKey==""` 报错,即使旧卡实际无任何客户绑定记录
|
||||
- 建议在上线前执行:`SELECT COUNT(*) FROM tb_personal_customer_device WHERE (virtual_no IS NULL OR virtual_no = '') AND deleted_at IS NULL` 确认是否有历史脏数据需要清理
|
||||
- **临时线上补丁(知悉)**:2026-06-18 已将线上 12,000+ 张无虚拟号的卡手动补充了虚拟号作为应急措施,以保障线上可用性。数据回滚由业务方自行处理,不在本次实现范围内。
|
||||
@@ -0,0 +1,50 @@
|
||||
Status: done
|
||||
|
||||
# CustomerBinding 模块骨架 + 有虚拟号路径替换(纯重构)
|
||||
|
||||
## What to build
|
||||
|
||||
建立 `internal/service/customer_binding` 包,对外暴露 `Bind()` 和 `OwnsAsset()` 两个接口,将现有有虚拟号路径的逻辑迁入。同时将代码库中 6 处归属验证调用点统一替换为新接口。
|
||||
|
||||
**本切片是纯重构,不改变任何现有行为。**
|
||||
|
||||
### Bind(ctx, tx, customerID, assetType, assetID)
|
||||
|
||||
封装创建客户与资产绑定记录的逻辑,当前只实现有虚拟号路径:
|
||||
- IoT 卡有虚拟号 → 写 `tb_personal_customer_device`(与现在 `bindAsset` 行为一致)
|
||||
- 设备 → 写 `tb_personal_customer_device`(设备必然有虚拟号)
|
||||
- 首次绑定时触发 `markAssetAsSold()`(firstEverBind 逻辑保持不变)
|
||||
|
||||
### OwnsAsset(ctx, customerID, assetType, assetID) bool
|
||||
|
||||
封装归属验证逻辑,当前只实现有虚拟号路径:
|
||||
- 查 `tb_personal_customer_device WHERE virtual_no = ? AND status = 1`
|
||||
- 内部统一强制 `status = 1` 过滤(修复现有部分实现缺少此过滤的安全缺口)
|
||||
|
||||
### 替换 6 处调用点
|
||||
|
||||
以下调用点替换为 `CustomerBinding` 的方法:
|
||||
|
||||
| 调用点 | 替换目标 |
|
||||
|--------|---------|
|
||||
| `client_auth/service.go: bindAsset()` | `CustomerBinding.Bind()` |
|
||||
| `handler/app/client_realname.go:92` | `CustomerBinding.OwnsAsset()` |
|
||||
| `handler/app/client_device.go:82` | `CustomerBinding.OwnsAsset()` |
|
||||
| `handler/app/client_wallet.go: isCustomerOwnAsset()` | `CustomerBinding.OwnsAsset()` |
|
||||
| `handler/app/client_asset.go: isCustomerOwnAsset()` | `CustomerBinding.OwnsAsset()` |
|
||||
| `service/client_order/service.go: checkAssetOwnership()` | `CustomerBinding.OwnsAsset()` |
|
||||
|
||||
exchange service 的 `customerOwnsAsset()` 在切片 3 中处理。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] `internal/service/customer_binding` 包存在,对外暴露 `Bind` 和 `OwnsAsset`
|
||||
- [ ] 有虚拟号的 IoT 卡登录后,`tb_personal_customer_device` 正常写入绑定记录(与现在一致)
|
||||
- [ ] 设备登录后,`tb_personal_customer_device` 正常写入绑定记录(与现在一致)
|
||||
- [ ] 被禁用(status=0)的绑定记录不能通过 `OwnsAsset` 验证(修复安全缺口)
|
||||
- [ ] 6 处调用点全部替换完毕,原有私有方法(resolveAssetBindingKey、isCustomerOwnAsset 等)可删除
|
||||
- [ ] 有虚拟号卡的实名认证、购买套餐、设备操作全链路与现在行为一致
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - 可立即开始
|
||||
@@ -0,0 +1,52 @@
|
||||
Status: done
|
||||
|
||||
# 无虚拟号单卡 C 端完整链路
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/customer-binding-architecture/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
扩展 `CustomerBinding` 模块,使无虚拟号的独立 IoT 卡(单卡)能够完整走通 C 端业务流程:登录绑定、实名认证、购买套餐。
|
||||
|
||||
**仅影响 IoT 卡(单卡)。设备资产必然有虚拟号,不在本切片处理范围内。**
|
||||
|
||||
### 扩展 Bind()
|
||||
|
||||
当资产为 IoT 卡且 `virtual_no` 为空时:
|
||||
- 写 `tb_personal_customer_iccid`(按 ICCID 绑定),而非 `tb_personal_customer_device`
|
||||
- `PersonalCustomerICCIDStore` 已有完整实现,直接注入使用
|
||||
|
||||
当资产为 IoT 卡且 `virtual_no` 不为空时:行为与切片 1 一致,不变。
|
||||
|
||||
### 修复 firstEverBind + markAssetAsSold
|
||||
|
||||
当前 `firstEverBind` 通过查 `tb_personal_customer_device WHERE virtual_no = ""` 来判断是否首次绑定,对无虚拟号的卡完全失效(所有无虚拟号的卡共用同一个空 key)。
|
||||
|
||||
修复方式:在 `Bind()` 内,按路径分别判断首绑:
|
||||
- 有虚拟号路径:查 `tb_personal_customer_device WHERE virtual_no = ?`
|
||||
- 无虚拟号路径:查 `tb_personal_customer_iccid WHERE iccid = ?`
|
||||
|
||||
首次绑定后正常触发 `markAssetAsSold()`,将卡的 `asset_status` 从在库(1)更新为已销售(2)。
|
||||
|
||||
### 扩展 OwnsAsset()
|
||||
|
||||
当资产为 IoT 卡时:
|
||||
- 若卡有 `virtual_no`:查 `tb_personal_customer_device`(与切片 1 一致)
|
||||
- 若卡无 `virtual_no`:查 `tb_personal_customer_iccid WHERE iccid = ? AND status = 1`
|
||||
|
||||
当资产为设备时:行为不变,只查 `tb_personal_customer_device`。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] 无虚拟号的单卡 C 端登录后,`tb_personal_customer_iccid` 中出现对应的绑定记录
|
||||
- [ ] 无虚拟号单卡首次登录后,`tb_iot_card.asset_status` 变为 2(已销售)
|
||||
- [ ] 无虚拟号单卡登录后,实名认证接口返回成功(不报"无权限")
|
||||
- [ ] 无虚拟号单卡登录后,购买套餐接口归属验证通过
|
||||
- [ ] 有虚拟号卡的全部行为与切片 1 完成后保持一致(无回归)
|
||||
- [ ] 设备资产的全部行为不受影响
|
||||
|
||||
## Blocked by
|
||||
|
||||
`.scratch/customer-binding-architecture/issues/01-customer-binding-module-refactor.md`
|
||||
@@ -0,0 +1,45 @@
|
||||
Status: done
|
||||
|
||||
# 换货绑定迁移修复
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/customer-binding-architecture/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 `CustomerBinding` 模块上实现 `Migrate(ctx, tx, oldAsset, newAsset)` 方法,替换换货服务中现有的 `switchCustomerBindingWithTx` 和 `ensureNewAssetBindingAvailableWithTx` 逻辑,修复有虚拟号旧卡换无虚拟号新卡时被误拦截的 bug。
|
||||
|
||||
### Migrate(ctx, tx, oldAsset, newAsset)
|
||||
|
||||
处理四种虚拟号组合,仅涉及 IoT 卡(设备必然有虚拟号,只有有→有一种情形):
|
||||
|
||||
| 旧卡 | 新卡 | 行为 |
|
||||
|------|------|------|
|
||||
| 有虚拟号,pcd 有绑定 | 有虚拟号 | 更新 pcd 记录的 virtual_no 为新卡虚拟号 |
|
||||
| 有虚拟号,pcd 有绑定 | 无虚拟号 | 禁用旧 pcd 记录(status=0)+ 创建新 pci ICCID 绑定 |
|
||||
| 有虚拟号,pcd 无绑定 | 无虚拟号 | 跳过,无需迁移 |
|
||||
| 无虚拟号,pci 有绑定 | 任意 | 迁移 pci 记录到新卡 ICCID(或新卡虚拟号路径) |
|
||||
| 任意 | 任意(无绑定) | 跳过 |
|
||||
|
||||
### 修复换货服务
|
||||
|
||||
- `switchCustomerBindingWithTx` 替换为调用 `CustomerBinding.Migrate()`,移除函数内 `newKey == ""` 的误拦截逻辑
|
||||
- `ensureNewAssetBindingAvailableWithTx` 更新:当新卡无虚拟号时,不再拦截换货,因为 `Migrate()` 已能正确处理此情形(无绑定时跳过,有绑定时迁移到 pci)
|
||||
|
||||
### 根本 bug 说明
|
||||
|
||||
原 `switchCustomerBindingWithTx` 在执行阶段做了 `if newKey == "" { return error }` 的检查,但没有先确认旧资产是否实际存在绑定记录。旧卡有虚拟号但无任何客户绑定时,也会被误拦截报错"新资产无法承接客户绑定"。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] 旧卡有虚拟号 + 有客户绑定,换货为有虚拟号新卡:pcd 记录的 virtual_no 正确更新为新卡虚拟号
|
||||
- [ ] 旧卡有虚拟号 + 有客户绑定,换货为无虚拟号新卡:旧 pcd 记录 status 变为 0,pci 表出现新卡 ICCID 的绑定记录
|
||||
- [ ] 旧卡有虚拟号 + 无客户绑定,换货为无虚拟号新卡:换货正常完成,不报错,不写入任何绑定记录
|
||||
- [ ] 旧卡无虚拟号,换货为任意新卡:换货正常完成
|
||||
- [ ] 有虚拟号换有虚拟号(原有场景):行为与修复前一致,无回归
|
||||
- [ ] 换货完成后,客户通过新卡(无论有无虚拟号)能正常通过归属验证
|
||||
|
||||
## Blocked by
|
||||
|
||||
`.scratch/customer-binding-architecture/issues/02-no-virtual-no-card-cend-flow.md`
|
||||
143
.scratch/enterprise-auth-and-asset-enhancements/PRD.md
Normal file
143
.scratch/enterprise-auth-and-asset-enhancements/PRD.md
Normal file
@@ -0,0 +1,143 @@
|
||||
Status: ready-for-agent
|
||||
|
||||
# PRD:企业授权增强 & 资产列表扩展
|
||||
|
||||
## Problem Statement
|
||||
|
||||
平台运营人员在管理企业授权和查看资产状态时面临以下痛点:
|
||||
|
||||
1. **企业维度检索缺失**:卡列表和设备列表无法按企业维度过滤,也无法在列表中直接看到某张卡/设备被授权给了哪个企业,需要跨页面跳转查询。
|
||||
2. **企业授权操作繁琐**:授权和收回接口只接受精确 ICCID/虚拟号列表,但前端列表有分页,量大时需一个个选,无法按批次号、号段等条件一次性批量操作。
|
||||
3. **换货历史不可见**:经历过换货的旧卡/设备,在列表和详情中没有任何标记,运营无法判断当前资产是否为"换货遗留"状态或曾经历过换货后被重新激活(转新)的资产。
|
||||
4. **主钱包流水和退款列表检索维度不足**:无法直接通过资产标识(ICCID 或虚拟号)快速定位某个资产相关的流水和退款记录。
|
||||
5. **卡网络状态过滤缺失**:standalone 卡列表无法按网络状态(开机/停机)过滤,批量运维操作不便。
|
||||
|
||||
## Solution
|
||||
|
||||
对六个业务场景进行针对性扩展:
|
||||
|
||||
1. 在 standalone 卡列表和设备列表中新增企业维度过滤及企业信息返回字段
|
||||
2. 将企业授权/收回接口升级为支持 list/range/filter 三(两)模式选资产
|
||||
3. 在 standalone 卡列表和设备列表响应中暴露换货业务状态和资产世代编号
|
||||
4. 主钱包流水列表新增资产标识精确检索
|
||||
5. 退款列表新增资产标识精确检索
|
||||
6. standalone 卡列表新增网络状态过滤
|
||||
|
||||
同时修复卡企业授权表的数据一致性问题(补唯一约束,与设备授权保持一致)。
|
||||
|
||||
## User Stories
|
||||
|
||||
1. 作为平台运营,我希望在 standalone 卡列表中输入企业 ID 进行过滤,以便快速找到已授权给该企业的所有卡
|
||||
2. 作为平台运营,我希望在 standalone 卡列表中使用"是否授权企业"开关过滤,以便快速区分已授权和未授权的卡库存
|
||||
3. 作为平台运营,我希望在 standalone 卡列表中直接看到每张卡被授权给哪个企业(企业ID和名称),以便不用跳转到企业详情页
|
||||
4. 作为平台运营,我希望在设备列表中输入企业 ID 进行过滤,以便快速找到已授权给该企业的所有设备
|
||||
5. 作为平台运营,我希望在设备列表中使用"是否授权企业"开关过滤,以便区分已授权和未授权的设备
|
||||
6. 作为平台运营,我希望在设备列表中直接看到每台设备被授权给哪个企业,以便快速掌握设备归属
|
||||
7. 作为平台运营,我希望在授权卡给企业时能通过 ICCID 号段范围一次性选取,以便高效授权大批量卡
|
||||
8. 作为平台运营,我希望在授权卡给企业时能通过批次号、运营商等筛选条件选取,以便按业务维度批量授权
|
||||
9. 作为平台运营,我希望在收回企业卡授权时同样支持 list/range/filter 三种模式,以便与授权操作保持一致的操作体验
|
||||
10. 作为平台运营,我希望在授权设备给企业时能通过虚拟号模糊搜索和批次号筛选一次性选取,以便批量操作设备
|
||||
11. 作为平台运营,我希望在收回企业设备授权时支持 list/filter 两种模式,以便批量收回
|
||||
12. 作为平台运营,我希望在 standalone 卡列表中看到每张卡的业务状态(`asset_status`),以便识别已换货但尚未转新的"死档"卡
|
||||
13. 作为平台运营,我希望在 standalone 卡列表中看到每张卡的世代编号(`generation`),以便识别曾换货后转新重入库的卡
|
||||
14. 作为平台运营,我希望在设备列表中看到每台设备的业务状态和世代编号,以便同样掌握设备的换货历史
|
||||
15. 作为平台运营,我希望在主钱包流水列表中输入 ICCID 或虚拟号精确检索,以便快速定位某资产的所有充值/扣款记录
|
||||
16. 作为平台运营,我希望在退款列表中输入 ICCID 或虚拟号精确检索,以便快速找到某资产相关的所有退款申请
|
||||
17. 作为平台运营,我希望在 standalone 卡列表中按网络状态(开机/停机)过滤,以便批量处理特定网络状态的卡
|
||||
|
||||
## Implementation Decisions
|
||||
|
||||
### 数据一致性修复(前置)
|
||||
|
||||
- **卡企业授权唯一约束**:在 `tb_enterprise_card_authorization` 表上补充部分唯一索引,约束同一张卡在同一时间只能有一条有效授权记录(`WHERE revoked_at IS NULL AND deleted_at IS NULL`),与设备授权表的 `uq_active_device_auth` 约束保持一致
|
||||
- **service 层校验补充**:卡授权 service 在执行授权前,需增加"卡是否已授权给其他企业"的校验,目前只校验同一企业重复授权
|
||||
|
||||
### 需求1:standalone 卡列表 + 设备列表企业字段
|
||||
|
||||
**Request 新增过滤条件**(`ListStandaloneIotCardRequest` 和 `ListDeviceRequest`):
|
||||
- `authorized_enterprise_id *uint`:按企业ID过滤,只匹配当前有效授权(`revoked_at IS NULL`)
|
||||
- `is_authorized_to_enterprise *bool`:true=已授权给某企业,false=未授权任何企业
|
||||
|
||||
**Response 新增字段**(`StandaloneIotCardResponse` 和 `DeviceResponse`):
|
||||
- `authorized_enterprise_id *uint`:未授权时为 null
|
||||
- `authorized_enterprise_name string`:未授权时为空字符串
|
||||
|
||||
Store 层需通过 JOIN 或子查询 `tb_enterprise_card_authorization` / `tb_enterprise_device_authorization` 表获取企业ID,再批量查企业名称
|
||||
|
||||
### 需求2:企业授权/收回接口升级为多模式
|
||||
|
||||
参照 `AllocateStandaloneCardsRequest` / `RecallStandaloneCardsRequest` 的 `selection_type` 三模式设计:
|
||||
|
||||
**allocate-cards / recall-cards**(三模式:list / range / filter):
|
||||
- `list`:`ICCIDs []string`,精确 ICCID 列表
|
||||
- `range`:`ICCIDStart string` + `ICCIDEnd string`,号段范围
|
||||
- `filter`:筛选条件
|
||||
- allocate-cards filter 字段:`ICCID`(模糊)、`BatchNo`、`CarrierID`、`ShopID`/`ShopIDs`
|
||||
- recall-cards filter 字段:`ICCID`(模糊)、`BatchNo`、`CarrierID`
|
||||
|
||||
**allocate-devices / recall-devices**(两模式:list / filter,不支持 range):
|
||||
- `list`:`DeviceNos []string`,设备虚拟号列表
|
||||
- `filter`:筛选条件
|
||||
- allocate-devices filter 字段:`VirtualNo`(模糊)、`BatchNo`、`ShopID`
|
||||
- recall-devices filter 字段:`VirtualNo`(模糊)、`BatchNo`
|
||||
|
||||
原有接口的请求结构需要破坏性变更(DTO 重构),需与前端联调确认过渡方案
|
||||
|
||||
### 需求3:换货状态字段
|
||||
|
||||
**`StandaloneIotCardResponse` 和 `DeviceResponse` 新增字段**:
|
||||
- `asset_status int`:业务状态(1=在库, 2=已销售, 3=已换货, 4=已停用)
|
||||
- `asset_status_name string`:对应中文名称
|
||||
- `generation int`:资产世代编号(初始值1,每次换货+转新后+1)
|
||||
|
||||
语义约定:
|
||||
- `asset_status = 3`:该资产已换货且尚未执行"旧资产转新",是永久性死档标记
|
||||
- `generation > 1`:该资产历史上曾执行过换货+转新,目前仍在流通
|
||||
|
||||
### 需求4:主钱包流水资产标识检索
|
||||
|
||||
`MainWalletTransactionListRequest` 新增:
|
||||
- `AssetIdentifier string`:精确匹配 `asset_identifier` 快照字段(ICCID 或虚拟号),空字符串时不过滤
|
||||
|
||||
### 需求5:退款列表资产标识检索
|
||||
|
||||
`RefundListRequest` 新增:
|
||||
- `AssetIdentifier string`:精确匹配 `asset_identifier` 快照字段(ICCID 或虚拟号),空字符串时不过滤
|
||||
|
||||
### 需求6:standalone 卡列表网络状态过滤
|
||||
|
||||
`ListStandaloneIotCardRequest` 新增:
|
||||
- `NetworkStatus *int`:网络状态过滤(0=停机, 1=开机),不传则不过滤
|
||||
|
||||
Store 层 `applyStandaloneFilters` 函数中补充 `network_status = ?` 条件
|
||||
|
||||
## Testing Decisions
|
||||
|
||||
本项目禁止自动化测试,验证方式为:
|
||||
|
||||
- **数据库验证**:通过 PostgreSQL MCP 工具验证授权表唯一约束是否生效、字段值是否正确写入
|
||||
- **接口验证**:通过 curl/Postman 对各接口进行手动联调,重点覆盖以下场景:
|
||||
- 企业 ID 过滤:确认只返回有效授权(revoked_at IS NULL)的卡/设备
|
||||
- 是否授权企业过滤:true/false 结果集互补且无交集
|
||||
- 授权时尝试将同一张卡授权给第二个企业,确认被拒绝
|
||||
- allocate-cards 三种 selection_type 均能正确选取目标卡
|
||||
- allocate-devices 两种 selection_type 均能正确选取目标设备
|
||||
- asset_status=3 的卡在列表中可见且字段正确
|
||||
- generation 字段在换货+转新后正确递增
|
||||
- 主钱包流水 asset_identifier 精确匹配不漏不多
|
||||
- 退款 asset_identifier 精确匹配不漏不多
|
||||
- 网络状态过滤 0/1 结果集互补
|
||||
|
||||
## Out of Scope
|
||||
|
||||
- 企业卡/设备授权列表接口本身的改造(本次只改授权/收回操作接口)
|
||||
- `AllocateCardsPreviewReq`(预览接口)是否同步升级为多模式(待后续评估)
|
||||
- standalone 卡列表和设备列表的导出功能是否同步支持新增过滤条件
|
||||
- 换货历史的完整时间线展示(仅暴露字段,不新增详情接口)
|
||||
- `generation` 字段的过滤能力(暂只返回,不支持作为检索条件)
|
||||
|
||||
## Further Notes
|
||||
|
||||
- 需求1 的企业名称需要 N+1 防护:通过授权查询批量拿到 enterprise_id 后,用 IN 一次性查企业名称,不能逐条查
|
||||
- 需求2 的 filter 模式对于 allocate-cards 场景,卡的范围天然受操作者权限约束(代理用户只能授权自己店铺的卡),Store 层已有 `middleware.ApplyShopFilter` 处理,filter 模式需要同样受此约束
|
||||
- 卡唯一约束迁移执行前,需确认现有数据中是否存在一张卡同时有多条 `revoked_at IS NULL` 的记录,若有需先清理
|
||||
@@ -0,0 +1,28 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
修复卡企业授权的数据一致性问题,使其与设备授权保持一致:一张卡在同一时间只能授权给一个企业。
|
||||
|
||||
分两步:
|
||||
|
||||
**第一步:数据库迁移**
|
||||
在 `tb_enterprise_card_authorization` 表上新增部分唯一索引,约束同一张卡不能同时存在两条有效授权记录(`revoked_at IS NULL AND deleted_at IS NULL`)。迁移执行前需先查询是否存在脏数据(同一 card_id 有多条 revoked_at IS NULL 的记录),若有需在迁移脚本中先行清理。
|
||||
|
||||
**第二步:service 层校验补充**
|
||||
卡授权 service(`BatchAuthorize`)在执行授权前,增加"目标卡是否已授权给其他企业"的校验。目前代码只跳过已授权给同一企业的卡,不阻止授权给第二个企业。新逻辑:若目标卡已存在有效授权(`revoked_at IS NULL`)且授权对象不是当前企业,则将该卡加入失败列表并给出明确错误原因(如"卡已授权给其他企业,请先收回")。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] `tb_enterprise_card_authorization` 表存在部分唯一索引,约束 `(card_id) WHERE revoked_at IS NULL AND deleted_at IS NULL`
|
||||
- [x] 尝试将同一张卡授权给第二个企业时,接口返回失败,错误信息明确说明"已授权给其他企业"
|
||||
- [x] 已撤回(revoked_at 有值)的历史记录不受唯一约束影响,可正常查询
|
||||
- [x] 同一张卡授权给同一企业时仍返回"已授权给该企业"的原有错误,行为不变
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -0,0 +1,22 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 `/api/admin/iot-cards/standalone` 接口的查询条件中新增网络状态过滤。
|
||||
|
||||
Request DTO 新增可选字段 `network_status *int`(0=停机,1=开机),不传时不过滤。Store 层 `applyStandaloneFilters` 函数补充对应的 `network_status = ?` WHERE 条件。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] 传入 `network_status=0` 时只返回停机的卡
|
||||
- [x] 传入 `network_status=1` 时只返回开机的卡
|
||||
- [x] 不传 `network_status` 时返回全部(与改动前行为一致)
|
||||
- [x] 网络状态过滤可与现有其他过滤条件(ICCID、运营商等)叠加使用
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -0,0 +1,34 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 standalone 卡列表响应和设备列表响应中暴露换货相关字段,使运营人员能直接在列表中识别资产的换货历史。
|
||||
|
||||
**`StandaloneIotCardResponse` 新增三个字段:**
|
||||
- `asset_status int`:业务状态(1=在库, 2=已销售, 3=已换货, 4=已停用)
|
||||
- `asset_status_name string`:对应中文名称
|
||||
- `generation int`:资产世代编号(初始值1,每次换货+旧资产转新后 +1)
|
||||
|
||||
**`DeviceResponse` 同步新增相同三个字段。**
|
||||
|
||||
语义约定(写入注释和 description):
|
||||
- `asset_status = 3`:该资产已换货且尚未执行"旧资产转新",不再流通
|
||||
- `generation > 1`:该资产历史上曾执行过换货后转新,目前仍在使用
|
||||
|
||||
Service 层组装响应时直接从 Model 取值,`asset_status_name` 通过 constants 中的方法转换。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] `/api/admin/iot-cards/standalone` 响应中每条记录包含 `asset_status`、`asset_status_name`、`generation` 三个字段
|
||||
- [x] `/api/admin/devices` 响应中每条记录包含相同三个字段
|
||||
- [x] 已换货未转新的卡/设备返回 `asset_status=3`、`asset_status_name="已换货"`
|
||||
- [x] 经过换货转新重入库的卡/设备返回 `generation=2`(或更高)且 `asset_status=1`
|
||||
- [x] 普通未经历换货的资产返回 `generation=1`
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -0,0 +1,23 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 `/api/admin/shops/{shop_id}/main-wallet/transactions` 接口的查询条件中新增资产标识精确检索。
|
||||
|
||||
`MainWalletTransactionListRequest` 新增可选字段 `asset_identifier string`,非空时对 `asset_identifier` 列做精确匹配(`= ?`,不做模糊匹配)。`asset_identifier` 字段存储的是下单时资产的标识符快照(ICCID 或虚拟号),空字符串时不过滤。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] 传入有效的 ICCID 时只返回该卡相关的主钱包流水
|
||||
- [x] 传入有效的设备虚拟号时只返回该设备相关的主钱包流水
|
||||
- [x] 传入不存在的标识符时返回空列表(total=0),不报错
|
||||
- [x] 不传 `asset_identifier` 时行为与改动前完全一致
|
||||
- [x] 可与 `transaction_type`、`start_date`、`end_date` 等现有条件叠加使用
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -0,0 +1,23 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 `/api/admin/refunds` 接口的查询条件中新增资产标识精确检索。
|
||||
|
||||
`RefundListRequest` 新增可选字段 `asset_identifier string`,非空时对退款记录的 `asset_identifier` 列做精确匹配(`= ?`)。该字段存储的是下单时资产的标识符快照(ICCID 或虚拟号),空字符串时不过滤。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] 传入有效的 ICCID 时只返回该卡相关的退款申请
|
||||
- [x] 传入有效的设备虚拟号时只返回该设备相关的退款申请
|
||||
- [x] 传入不存在的标识符时返回空列表(total=0),不报错
|
||||
- [x] 不传 `asset_identifier` 时行为与改动前完全一致
|
||||
- [x] 可与 `status`、`order_id`、`shop_id` 等现有条件叠加使用
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -0,0 +1,33 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 `/api/admin/iot-cards/standalone` 接口中新增企业维度过滤条件,并在响应中返回当前有效授权的企业信息。
|
||||
|
||||
**Request 新增过滤条件(`ListStandaloneIotCardRequest`):**
|
||||
- `authorized_enterprise_id *uint`:按企业ID过滤,只匹配 `tb_enterprise_card_authorization` 中 `revoked_at IS NULL` 的有效授权
|
||||
- `is_authorized_to_enterprise *bool`:true=只返回当前已授权给某企业的卡,false=只返回未授权任何企业的卡
|
||||
|
||||
**Response 新增字段(`StandaloneIotCardResponse`):**
|
||||
- `authorized_enterprise_id *uint`:当前有效授权的企业ID,未授权时为 null
|
||||
- `authorized_enterprise_name string`:对应企业名称,未授权时为空字符串
|
||||
|
||||
Store 层在 `applyStandaloneFilters` 中增加对 `authorized_enterprise_id` 和 `is_authorized_to_enterprise` 的处理,通过子查询 `tb_enterprise_card_authorization`(`revoked_at IS NULL AND deleted_at IS NULL`)实现过滤。响应组装时批量查询企业名称(IN 查询),不逐条查询。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] 传入 `authorized_enterprise_id` 时只返回当前有效授权给该企业的卡
|
||||
- [x] 传入 `is_authorized_to_enterprise=true` 时只返回已授权给某企业的卡
|
||||
- [x] 传入 `is_authorized_to_enterprise=false` 时只返回未授权任何企业的卡
|
||||
- [x] 已撤回的历史授权不影响过滤结果(已撤回视为未授权)
|
||||
- [x] 响应中每张卡包含 `authorized_enterprise_id` 和 `authorized_enterprise_name`,未授权卡对应字段为 null/空字符串
|
||||
- [x] 企业名称通过批量查询获取,不触发 N+1 查询
|
||||
- [x] 新增过滤条件可与现有条件(ICCID、运营商、店铺等)叠加使用
|
||||
|
||||
## Blocked by
|
||||
|
||||
- `issues/01-card-enterprise-auth-unique-constraint.md`
|
||||
@@ -0,0 +1,32 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
在 `/api/admin/devices` 接口中新增企业维度过滤条件,并在响应中返回当前有效授权的企业信息。
|
||||
|
||||
**Request 新增过滤条件(`ListDeviceRequest`):**
|
||||
- `authorized_enterprise_id *uint`:按企业ID过滤,只匹配 `tb_enterprise_device_authorization` 中 `revoked_at IS NULL` 的有效授权
|
||||
- `is_authorized_to_enterprise *bool`:true=只返回当前已授权给某企业的设备,false=只返回未授权任何企业的设备
|
||||
|
||||
**Response 新增字段(`DeviceResponse`):**
|
||||
- `authorized_enterprise_id *uint`:当前有效授权的企业ID,未授权时为 null
|
||||
- `authorized_enterprise_name string`:对应企业名称,未授权时为空字符串
|
||||
|
||||
Store 层通过子查询或 JOIN `tb_enterprise_device_authorization` 实现过滤。响应组装时批量查询企业名称(IN 查询),不逐条查询。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] 传入 `authorized_enterprise_id` 时只返回当前有效授权给该企业的设备
|
||||
- [x] 传入 `is_authorized_to_enterprise=true` 时只返回已授权给某企业的设备
|
||||
- [x] 传入 `is_authorized_to_enterprise=false` 时只返回未授权任何企业的设备
|
||||
- [x] 已撤回的历史授权不影响过滤结果(已撤回视为未授权)
|
||||
- [x] 响应中每台设备包含 `authorized_enterprise_id` 和 `authorized_enterprise_name`,未授权设备对应字段为 null/空字符串
|
||||
- [x] 企业名称通过批量查询获取,不触发 N+1 查询
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -0,0 +1,42 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
将企业卡授权和收回接口升级为支持 list/range/filter 三种模式批量选取卡,替代原来只接受精确 ICCID 列表的方式。
|
||||
|
||||
**涉及接口:**
|
||||
- `POST /api/admin/enterprises/{id}/allocate-cards`
|
||||
- `POST /api/admin/enterprises/{id}/recall-cards`
|
||||
|
||||
**`AllocateCardsReq` 重构为:**
|
||||
- `selection_type string`(必填,`list`、`range` 或 `filter`)
|
||||
- list 模式:`iccids []string`(ICCID 列表,最多1000个)
|
||||
- range 模式:`iccid_start string` + `iccid_end string`(号段范围)
|
||||
- filter 模式过滤字段:`iccid string`(模糊)、`batch_no string`、`carrier_id *uint`、`shop_id *uint`、`shop_ids []uint`
|
||||
- `remark string`(备注,所有模式均可选)
|
||||
|
||||
**`RecallCardsReq` 重构为:**
|
||||
- `selection_type string`(必填,`list`、`range` 或 `filter`)
|
||||
- list 模式:`iccids []string`
|
||||
- range 模式:`iccid_start string` + `iccid_end string`
|
||||
- filter 模式过滤字段:`iccid string`(模糊)、`batch_no string`、`carrier_id *uint`
|
||||
|
||||
filter 和 range 模式下,allocate 操作的候选卡集受操作者权限约束(代理用户只能授权自己店铺的卡),与 `applyStandaloneFilters` 中的 `ApplyShopFilter` 逻辑保持一致。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] `allocate-cards` 接口接受 `selection_type=list` + `iccids`,行为与改动前一致
|
||||
- [x] `allocate-cards` 接口接受 `selection_type=range` + 号段,批量授权号段内所有匹配的卡
|
||||
- [x] `allocate-cards` 接口接受 `selection_type=filter` + 过滤条件,批量授权所有匹配的卡
|
||||
- [x] `recall-cards` 接口同样支持三种模式,分别正确收回对应卡的企业授权
|
||||
- [x] filter/range 模式下代理用户只能操作自己店铺的卡,超出范围的卡进入失败列表
|
||||
- [x] 任何模式下尝试授权"已授权给其他企业"的卡,该卡进入失败列表并附带原因
|
||||
- [x] 响应中 `success_count`、`fail_count`、`failed_items` 准确反映实际执行结果
|
||||
|
||||
## Blocked by
|
||||
|
||||
- `issues/01-card-enterprise-auth-unique-constraint.md`
|
||||
@@ -0,0 +1,38 @@
|
||||
Status: ready-for-human
|
||||
|
||||
## Parent
|
||||
|
||||
`.scratch/enterprise-auth-and-asset-enhancements/PRD.md`
|
||||
|
||||
## What to build
|
||||
|
||||
将企业设备授权和收回接口升级为支持 list/filter 两种模式批量选取设备,替代原来只接受精确设备号列表的方式。
|
||||
|
||||
**涉及接口:**
|
||||
- `POST /api/admin/enterprises/{id}/allocate-devices`
|
||||
- `POST /api/admin/enterprises/{id}/recall-devices`
|
||||
|
||||
**`AllocateDevicesReq` 重构为:**
|
||||
- `selection_type string`(必填,`list` 或 `filter`)
|
||||
- list 模式:`device_nos []string`(设备虚拟号列表)
|
||||
- filter 模式过滤字段:`virtual_no string`(模糊)、`batch_no string`、`shop_id *uint`
|
||||
|
||||
**`RecallDevicesReq` 重构为:**
|
||||
- `selection_type string`(必填,`list` 或 `filter`)
|
||||
- list 模式:`device_nos []string`
|
||||
- filter 模式过滤字段:`virtual_no string`(模糊)、`batch_no string`
|
||||
|
||||
filter 模式下,allocate 操作的候选设备集受操作者权限约束(代理用户只能授权自己店铺的设备)。filter 模式命中的设备数量无硬性上限,但单次事务处理建议分批,超大批次需记录日志。
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [x] `allocate-devices` 接口接受 `selection_type=list` + `device_nos` 列表,行为与改动前一致
|
||||
- [x] `allocate-devices` 接口接受 `selection_type=filter` + 过滤条件,批量授权所有匹配设备
|
||||
- [x] `recall-devices` 接口接受 `selection_type=list` + `device_nos` 列表,行为与改动前一致
|
||||
- [x] `recall-devices` 接口接受 `selection_type=filter` + 过滤条件,批量收回所有匹配设备
|
||||
- [x] filter 模式下代理用户只能操作自己店铺的设备,超出范围的设备进入失败列表
|
||||
- [x] 响应中 `success_count`、`fail_count`、`failed_items` 准确反映实际执行结果
|
||||
|
||||
## Blocked by
|
||||
|
||||
None - can start immediately
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"active_plan": "/Users/break/csxjProject/junhong_cmp_fiber/.sisyphus/plans/add-gateway-admin-api.md",
|
||||
"started_at": "2026-02-02T09:24:48.582Z",
|
||||
"session_ids": [
|
||||
"ses_3e254bedbffeBTwWDP2VQqDr7q"
|
||||
],
|
||||
"plan_name": "add-gateway-admin-api"
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
# 架构决策记录
|
||||
|
||||
## goroutine context 设计(已确认)
|
||||
- 必须使用 `context.WithTimeout(context.Background(), 3*time.Second)` 创建独立 context
|
||||
- 禁止复用 `c.UserContext()`(Fiber 请求 context 在 handler 返回后立即失效)
|
||||
- goroutine 只接受标量参数(uint、string),不捕获 *fiber.Ctx 或任何指针
|
||||
|
||||
## 系统用户身份(已确认)
|
||||
- 使用 `UserTypePlatform` 而非 `UserTypeSuperAdmin`
|
||||
- Platform 用户仍受 500次/天日限制约束
|
||||
- SuperAdmin 不受日限制约束(不符合要求)
|
||||
|
||||
## 配置结构体命名(已确认)
|
||||
- 新增 `PollingAutoTriggerConfig` 结构体
|
||||
- Config 中字段名:`PollingAutoTrigger PollingAutoTriggerConfig`
|
||||
- YAML key: `polling_auto_trigger`
|
||||
- 环境变量前缀:`JUNHONG_POLLING_AUTO_TRIGGER_`
|
||||
|
||||
## 配置验证(已确认)
|
||||
- 不在 Validate() 中添加校验
|
||||
- 零值(false/0)是合法默认值
|
||||
|
||||
## 原子提交策略(已确认)
|
||||
- Commit 1: config 文件
|
||||
- Commit 2: service bug fix + redis 注释
|
||||
- Commit 3: handler 集成(此时全量 build 暂时报错)
|
||||
- Commit 4: DI 接线(修复全量 build)
|
||||
@@ -0,0 +1,22 @@
|
||||
# 已知问题和注意事项
|
||||
|
||||
## assetService.ResolvedAsset 类型名已确认(重要修正)
|
||||
- 计划中写的 `assetService.ResolvedAsset` 是错误的
|
||||
- 实际类型:`*dto.AssetResolveResponse`(在 `internal/model/dto/asset_dto.go` 定义)
|
||||
- `h.assetService.Resolve()` 返回 `(*dto.AssetResolveResponse, error)`
|
||||
- 字段:`.AssetType` (string), `.AssetID` (uint), `.VirtualNo` (string)
|
||||
- `resolveTargetCard` 函数签名应为:
|
||||
`func (h *ClientRealnameHandler) resolveTargetCard(c *fiber.Ctx, asset *dto.AssetResolveResponse, iccid string) (*model.IotCard, error)`
|
||||
|
||||
## import 别名冲突
|
||||
- client_realname.go 已导入 `internal/middleware` (for GetCustomerID)
|
||||
- 需要额外导入 `pkg/middleware` (for SetUserContext) 时需使用别名
|
||||
- 建议: `pkgMiddleware "github.com/break/junhong_cmp_fiber/pkg/middleware"`
|
||||
|
||||
## processBatchTrigger 中也有 TTL Bug
|
||||
- 不仅 TriggerSingle (行72),processBatchTrigger (行192) 也有相同 Bug
|
||||
- 两处都需修复,不能漏
|
||||
|
||||
## 功能开关检查逻辑
|
||||
- `config.Get().PollingAutoTrigger.EnableAutoTrigger` 为 false 时跳过 goroutine 启动
|
||||
- 零值(false/0)是合法默认值,不需要在 Validate() 中校验
|
||||
@@ -0,0 +1,37 @@
|
||||
# 项目约定和模式
|
||||
|
||||
## 模块路径
|
||||
- 项目模块路径:`github.com/break/junhong_cmp_fiber`
|
||||
|
||||
## 关键包路径(区分 pkg vs internal)
|
||||
- `pkg/middleware` - 包含 `SetUserContext`, `UserContextInfo`, `GetUserTypeFromContext`
|
||||
- `internal/middleware` - 包含 `GetCustomerID(c *fiber.Ctx)` (C端个人客户认证)
|
||||
- `internal/service/polling` - ManualTriggerService 所在包
|
||||
- `pkg/constants` - UserTypePlatform, TaskTypePollingRealname 等常量
|
||||
|
||||
## 重要发现
|
||||
- `SetUserContext` 在 `pkg/middleware` 包,不在 `internal/middleware`
|
||||
- `UserContextInfo` 字段:UserID(uint), UserType(int), ShopID(uint), EnterpriseID(uint), CustomerID(uint)
|
||||
- `GetCustomerID(c *fiber.Ctx)` 在 `internal/middleware/personal_auth.go`,返回 (uint, bool)
|
||||
- manual_trigger_service.go 当前 469 行,进行重构
|
||||
|
||||
## 当前待修复 Bug
|
||||
- `todayCount >= 100` 在 3 处(行58, 129, 238)需改为 `>= 500`
|
||||
- `time.Hour` TTL 在 2 处(行72, 192)需改为 `24*time.Hour`
|
||||
- `RedisPollingManualDedupeKey` 注释写的"1小时"需改为"24小时"
|
||||
|
||||
## client_realname.go 重构要点
|
||||
- 当前 `GetRealnameLink` 函数 127 行,加新代码会超 100 行限制
|
||||
- 需提取 `resolveTargetCard(c *fiber.Ctx, asset, iccid)` - 资产类型 switch
|
||||
- 需提取 `buildRealnameResponse(ctx, card, carrier)` - 运营商 URL 调度
|
||||
- 注意:`findCardInDeviceBindings` 和 `findFirstBoundCard` 已存在,可从 resolveTargetCard 调用
|
||||
- goroutine 传标量值(uint, string),不能捕获 `c *fiber.Ctx`
|
||||
|
||||
## 依赖注入
|
||||
- `handlers.go` 第 66 行:`ClientRealname: app.NewClientRealnameHandler(...)` 需加第8个参数
|
||||
- `docs.go` 和 `gendocs/main.go` 各有一处 `NewClientRealnameHandler(nil*7)` 需改为 8个nil
|
||||
- `svc.PollingManualTrigger` 已在 services.go:210 初始化,可直接使用
|
||||
|
||||
## Commit 3 后临时编译失败
|
||||
- Task 4 修改构造函数后、Task 5 接线前,全量编译报错是预期行为
|
||||
- 只做文件级 LSP 检查,不跑全量 build
|
||||
15
.sisyphus/notepads/tech-debt-cleanup/decisions.md
Normal file
15
.sisyphus/notepads/tech-debt-cleanup/decisions.md
Normal file
@@ -0,0 +1,15 @@
|
||||
# tech-debt-cleanup 决策记录
|
||||
|
||||
## [2026-04-14] 初始化
|
||||
|
||||
### 任务执行顺序策略
|
||||
1. **优先执行独立任务(并行)**:Task 2 (API docs)、Task 3 (polling constants)、Task 4 (deprecated cleanup)、Task 7 (unused constants)、Task 8 (empty files)
|
||||
2. **Task 1(支付配置)**:需要先确认 pkg/payment/ 现有结构
|
||||
3. **Task 5(Model 字段)**:代码变更可与其他任务并行,DB 迁移执行需 DB 环境
|
||||
4. **Task 6(DTO _name)**:分模块逐批,每批独立验证
|
||||
5. **Task 0(DB迁移合并)**:需要 DB 环境,最后执行
|
||||
|
||||
### 支付配置动态加载架构
|
||||
- 新建 `pkg/payment/loader.go`,定义 `PaymentConfigLoader` 接口
|
||||
- Redis 缓存 TTL 1h,key: `payment:config:{configID}`
|
||||
- 权限检查:仅用户主动操作时校验;支付回调场景验证商户号一致性
|
||||
5
.sisyphus/notepads/tech-debt-cleanup/issues.md
Normal file
5
.sisyphus/notepads/tech-debt-cleanup/issues.md
Normal file
@@ -0,0 +1,5 @@
|
||||
# tech-debt-cleanup 问题记录
|
||||
|
||||
## [2026-04-14] 初始化
|
||||
|
||||
暂无已知问题。执行过程中发现的问题将记录于此。
|
||||
229
.sisyphus/notepads/tech-debt-cleanup/learnings.md
Normal file
229
.sisyphus/notepads/tech-debt-cleanup/learnings.md
Normal file
@@ -0,0 +1,229 @@
|
||||
# tech-debt-cleanup 学习记录
|
||||
|
||||
## [2026-04-14] 初始化
|
||||
|
||||
### 项目规范关键点
|
||||
- 所有注释必须使用中文
|
||||
- Redis Key 必须通过函数生成(格式:`Redis{Module}{Purpose}Key(params...)`)
|
||||
- 错误码必须定义在 `pkg/errors/codes.go`
|
||||
- 常量定义在 `pkg/constants/`
|
||||
- 架构:Handler → Service → Store → Model
|
||||
- 禁止使用外键约束
|
||||
- 禁止 Go 测试文件(*_test.go)
|
||||
|
||||
### 关键文件路径
|
||||
- 支付服务: `internal/service/order/service.go`, `internal/service/recharge/service.go`
|
||||
- 轮询服务: `internal/service/polling/manual_trigger_service.go`, `alert_service.go`
|
||||
- 轮询 Handler: `internal/handler/admin/polling_manual_trigger.go`
|
||||
- 轮询 Store: `internal/store/postgres/polling_manual_trigger_store.go`
|
||||
- 文档生成: `cmd/api/docs.go`, `cmd/gendocs/main.go`
|
||||
- Redis Key: `pkg/constants/redis.go`
|
||||
- 支付包: `pkg/payment/`
|
||||
- 废弃 DTO: `internal/model/dto/enterprise_card_authorization_dto.go`
|
||||
- 废弃任务: `internal/task/sync.go`
|
||||
- 空文件: `internal/routes/recharge.go`
|
||||
- Model: `internal/model/iot_card.go`, `internal/model/device.go`
|
||||
|
||||
## [2026-04-14] Task 3: 轮询状态常量提取
|
||||
|
||||
### 发现和注意点
|
||||
|
||||
1. **alert_service.go 的 "pending" 只有 1 处**:`NotificationStatus: "pending"` 在 `triggerAlert()` 函数中,其他字符串如 `"sent"`、`"partial"`、`"failed"` 是通知发送状态(非轮询触发日志状态),不在替换范围内。
|
||||
|
||||
2. **Store 层 SQL 字符串处理**:`polling_manual_trigger_store.go` 中 `GetRunning` 函数原本使用 SQL 字面量 `status IN ('pending', 'processing')`,改为 GORM 参数化查询 `status IN (?, ?)` 并传入常量,既消除硬编码又提升安全性。
|
||||
|
||||
3. **Store 层需要新增 import**:`polling_manual_trigger_store.go` 原本未导入 `constants` 包,添加时注意 Go import 分组规范(stdlib / 第三方 / 内部包)。
|
||||
|
||||
4. **constants 包在 handler 文件已存在**:`polling_manual_trigger.go` 已导入 `pkg/constants`,无需额外修改 import。
|
||||
|
||||
5. **manual_trigger_service.go 共 6 处替换**:3 处 `"processing"`(triggerLog 创建)、2 处 `"completed"`(UpdateStatus 调用)、1 处同时含 `"pending"` + `"processing"` + `"cancelled"` 的 CancelTrigger 状态检查。
|
||||
|
||||
## [2026-04-14] Task 4: 废弃代码清理
|
||||
|
||||
### 废弃别名实际引用情况
|
||||
扫描 `internal/` 和 `pkg/` 后,真正使用废弃别名的只有 3 处(其他文件早已用新常量):
|
||||
- `shop_commission/service.go:645` → `TransactionTypeWithdrawal` 替换为 `AgentTransactionTypeWithdrawal`
|
||||
- `recharge/service.go:91,94,417,418` → `RechargeMinAmount/RechargeMaxAmount` 替换为 `AssetRechargeMinAmount/AssetRechargeMaxAmount`(资产钱包充值场景,最小1元/最大100000元)
|
||||
|
||||
### CheckAndStopCard 无法删除
|
||||
`stop_resume_service.go` 中的 `CheckAndStopCard` 在接口 `StopResumeServiceInterface`(`usage_service.go:20`)中声明,并在 `package_activation_handler.go`(327、347行)和 `usage_service.go`(230、255行)中活跃调用。任务描述要求"确认无调用后再删除",此方法有调用,故跳过删除。
|
||||
|
||||
### grep 验证注意事项
|
||||
- `SyncHandler` 的 grep 命中了 `CommissionStatsSyncHandler`(合法),不是废弃的 DataSync handler。
|
||||
- `CardWallet` 出现在 `data_scope.go:82` 的注释字符串里(非代码引用),不需要修改。
|
||||
|
||||
### 删除的代码统计
|
||||
- `sync.go` 整个文件(166行)
|
||||
- `handler.go` 3行(syncHandler var + HandleFunc + logger.Info)
|
||||
- `constants.go` 1行(TaskTypeDataSync)
|
||||
- `wallet.go` 86行(149-234行废弃别名块)
|
||||
- `enterprise_card_authorization_dto.go` 22行(DeviceBundle、DeviceBundleCard、AllocatedDevice)
|
||||
- `order/service.go` 约243行(CreateLegacy 方法)
|
||||
|
||||
## [2026-04-14] Task 7+8: 常量清理和空文件删除
|
||||
|
||||
### 执行内容
|
||||
|
||||
**Task 7.1:删除 CodeExceedLimit 错误码**
|
||||
- 删除常量定义:`CodeExceedLimit = 1055` (line 68)
|
||||
- 删除 allErrorCodes 列表条目 (line 227)
|
||||
- 删除 errorMessages 映射条目 (line 359)
|
||||
- 验证:grep 确认代码库中无任何引用
|
||||
|
||||
**Task 7.2:为预留常量添加 [预留] 注释**
|
||||
- LadderType 系列(激活量、提货量、充值量):添加 `[预留] 用于分佣阶梯功能,待产品规划`
|
||||
- ApprovalType/ApprovalStatus 系列(审批类型/状态):添加 `[预留] 用于审批流程功能,待产品规划`
|
||||
- MerchantType 系列(支付宝、微信、银行卡):添加 `[预留] 用于未来商户管理功能,待产品规划`
|
||||
- ReplacementStatus 系列(换卡申请状态):添加 `[预留] 用于换卡申请功能,待产品规划`
|
||||
- ReplacementReason 系列(换货原因):添加 `[预留] 用于换卡原因管理功能,待产品规划`
|
||||
|
||||
**Task 8.1:删除空文件**
|
||||
- 删除 `internal/routes/recharge.go`(仅包含 `package routes`)
|
||||
|
||||
**Task 8.2:删除 postgres.go 的 AutoMigrate 注释块**
|
||||
- 删除 lines 90-95 的注释掉的 AutoMigrate 代码块
|
||||
|
||||
**Task 8.3:更新 client_order/service.go 注释**
|
||||
- 在 line 140 的实名认证检查注释前添加:`// [待确认] 业务是否需要实名认证检查?参见 tech-debt-cleanup 提案`
|
||||
|
||||
### 验证结果
|
||||
- ✅ `go build ./cmd/api ./cmd/worker` 通过
|
||||
- ✅ `go vet ./pkg/errors/ ./pkg/constants/ ./pkg/database/` 无报告
|
||||
- ✅ `grep -r "CodeExceedLimit"` 无结果(完全删除)
|
||||
- ✅ 所有预留常量已添加 [预留] 标记和产品规划说明
|
||||
|
||||
## [2026-04-14] Task 2: API 文档生成器补全
|
||||
|
||||
### 发现
|
||||
|
||||
- `BuildDocHandlers()` 缺少 3 个 Handler:`ClientAuth`、`AdminAuth`、`AssetLifecycle`,它们在 `bootstrap/types.go` 中有定义,但从未加入文档生成器
|
||||
- `AdminAuth` 在 `docs.go` 和 `gendocs/main.go` 中**完全未被设置**(连手动覆写都没有),这意味着 Admin Auth 相关路由一直缺失于 OpenAPI 文档
|
||||
- `docs.go` 和 `gendocs/main.go` 的手动覆写列表(9 行 `handlers.Xxx = ...`)中,大多数 handler 其实已经在 `BuildDocHandlers()` 中了,属于纯冗余
|
||||
|
||||
### 操作
|
||||
|
||||
1. `pkg/openapi/handlers.go`:按 types.go 字段顺序插入 `ClientAuth`(PersonalCustomer 后)、`AdminAuth`(ShopRole 后)、`AssetLifecycle`(Asset 后)
|
||||
2. `cmd/api/docs.go`:删除所有手动覆写行(9 行)+ 移除 `admin` 和 `apphandler` import
|
||||
3. `cmd/gendocs/main.go`:同上
|
||||
|
||||
### 注意点
|
||||
|
||||
- `admin.NewAuthHandler` 需要 2 个 nil 参数(authService + validator)
|
||||
- `app.NewClientAuthHandler` 需要 2 个 nil 参数(service + logger)
|
||||
- `admin.NewAssetLifecycleHandler` 只需 1 个 nil 参数(service 接口)
|
||||
- 清理完 import 后 `go build` + `go vet` 均通过,无报错
|
||||
|
||||
## [2026-04-14] Task 5: Model 废弃字段清理
|
||||
|
||||
### 引用情况(超出预期的额外文件)
|
||||
|
||||
计划中列出的文件之外,还发现了额外引用:
|
||||
- `internal/service/device/service.go` line 576-577:`DeviceResponse` 构建中有引用(计划中未提及)
|
||||
- `internal/service/recharge/service.go` line 31:`ForceRechargeRequirement` struct 有 `FirstCommissionPaid` 字段
|
||||
- `internal/service/recharge/service.go` line 458:`result.FirstCommissionPaid = firstCommissionPaid` 赋值
|
||||
|
||||
### 关键判断:recharge/service.go 的 firstCommissionPaid 变量
|
||||
|
||||
`checkForceRechargeRequirement` 中的 `firstCommissionPaid` 变量**不是废弃字段**:
|
||||
- 它读自 `card.IsFirstRechargeTriggeredBySeries(*seriesID)` 和 `device.IsFirstRechargeTriggeredBySeries(*seriesID)`(均是新 BySeries 方法)
|
||||
- 该变量用于 `if firstCommissionPaid {` 的业务判断(已发放则跳过强充检查)
|
||||
- 正确做法:只删 `ForceRechargeRequirement.FirstCommissionPaid` 字段 + `result.FirstCommissionPaid = firstCommissionPaid` 赋值,保留变量声明和 if 判断
|
||||
|
||||
### 迁移文件
|
||||
- 新建 `migrations/000116_remove_legacy_commission_fields.up.sql`
|
||||
- 新建 `migrations/000116_remove_legacy_commission_fields.down.sql`
|
||||
|
||||
### 验证结果
|
||||
- ✅ `go build ./cmd/api ./cmd/worker` 通过,无任何错误
|
||||
|
||||
## [2026-04-14] Task 1: 支付配置动态加载
|
||||
|
||||
### 实现架构决策
|
||||
|
||||
#### 1. PaymentConfigLoader 位置
|
||||
- 新建 `pkg/payment/loader.go`(包名 `payment`)
|
||||
- `pkg/` 下可以 import `internal/` 包(项目中已有先例:`pkg/wechat/config.go` import `internal/model`)
|
||||
|
||||
#### 2. 缓存策略
|
||||
- 不缓存 Payment 实例(含连接/状态,不可序列化)
|
||||
- 缓存 **WechatConfig JSON 数据**(key: `payment:config:{id}`,TTL: 1 小时)
|
||||
- 每次从缓存数据构建 Payment 实例(轻量操作,无 I/O)
|
||||
|
||||
#### 3. v2 适配器模式
|
||||
- `PaymentV2Service` 未实现完整 `PaymentServiceInterface`(缺少 H5/查单/关单/HandlePaymentNotify)
|
||||
- 通过 `v2PaymentAdapter` 包装,补全缺失方法(返回"不支持"错误)
|
||||
- **不修改** `payment_v2.go` 原文件
|
||||
|
||||
#### 4. `appID` 来源
|
||||
- `NewPaymentAppFromConfig` / `NewPaymentV2ServiceFromConfig` 均需要 `appID` 参数
|
||||
- 使用 `wechatConfig.OaAppID`(公众号 AppID)
|
||||
|
||||
#### 5. wechatCache 共享
|
||||
- loader 在构造时通过 `wechat.NewRedisCache(rdb)` 创建一次,所有 LoadConfig 调用复用
|
||||
- v3 Payment 实例构建需要此 cache(用于 PowerWeChat SDK 内部 token 缓存)
|
||||
|
||||
#### 6. worker_services.go 也需更新
|
||||
- `internal/bootstrap/worker_services.go` 里有另一处 `orderSvc.New` 调用(超时取消专用)
|
||||
- 需额外传 `nil` 占位
|
||||
|
||||
### 关键文件变更
|
||||
| 文件 | 变更内容 |
|
||||
|------|---------|
|
||||
| `pkg/constants/redis.go` | +`RedisPaymentConfigKey` |
|
||||
| `pkg/payment/loader.go` | 新建:接口 + 实现 + v2 适配器 |
|
||||
| `internal/service/order/service.go` | +`paymentLoader` 字段/参数,替换 2 处 TODO |
|
||||
| `internal/service/recharge/service.go` | +`paymentLoader` 字段/参数,更新 1 处 TODO 注释 |
|
||||
| `internal/bootstrap/services.go` | 创建 loader 实例,传入 Order/Recharge 构造函数 |
|
||||
| `internal/bootstrap/worker_services.go` | `orderSvc.New` 补传 `nil` |
|
||||
|
||||
### 验证结果
|
||||
- ✅ `go build ./cmd/api ./cmd/worker` 通过,无任何错误
|
||||
- ✅ `go vet` 无报告
|
||||
|
||||
## [2026-04-14] Task 6: DTO _name 字段补全
|
||||
|
||||
### 概述
|
||||
为所有 Response DTO 中的 `int` 类型状态字段补全对应 `string` 类型 `_name` 字段,并在 Service 层赋值。
|
||||
|
||||
### 常量映射函数(新增)
|
||||
|
||||
**`pkg/constants/constants.go`:**
|
||||
- `GetStatusName(status int) string` — 通用 0=禁用/1=启用
|
||||
- `GetShelfStatusName(status int) string` — 1=上架/2=下架
|
||||
- `GetExchangeStatusName(status int) string` — 换货单状态
|
||||
|
||||
**`pkg/constants/iot.go`:**
|
||||
- `GetIotCardStatusName` — 1=在库, 2=已分销, 3=已激活, 4=已停用
|
||||
- `GetActivationStatusName` — 0=未激活, 1=已激活
|
||||
- `GetRealNameStatusName` — 0=未实名, 1=已实名
|
||||
- `GetNetworkStatusName` — 0=停机, 1=开机
|
||||
- `GetCommissionRecordStatusName` — 1=已冻结/2=解冻中/3=已发放/4=已失效/99=待人工修正
|
||||
- `GetOrderPaymentStatusName` — 1=待支付/2=已支付/3=已取消/4=已退款
|
||||
- `GetOrderCommissionStatusName` — 1=待计算/2=已计算
|
||||
- `GetRefundStatusName` — 1=待审批/2=已通过/3=已拒绝/4=已退回
|
||||
|
||||
### 模块处理情况
|
||||
|
||||
| 模块 | DTO 改动 | Service 赋值位置 | 备注 |
|
||||
|------|---------|-----------------|------|
|
||||
| Account | `AccountResponse` + `status_name` | `toAccountResponse()` | constants 已导入 |
|
||||
| Shop | `ShopResponse` + `status_name` | Create/Update/ListShopResponses(3处)| constants 已导入 |
|
||||
| IotCard | `StandaloneIotCardResponse` + 4个 `_name` 字段 | `toStandaloneResponse()` | status/activation/realname/network |
|
||||
| Order | `OrderResponse` + `commission_status_name` | `buildOrderResponse()` | payment_status 已有 `_text` 字段 |
|
||||
| Package | `PackageResponse` + `status_name`/`shelf_status_name` | `toResponse()` 末尾(agent 覆盖后赋值) | my_package.go 也同步更新(不涉及 service)|
|
||||
| Refund | `RefundResponse` + `status_name` | `buildRefundResponse()` | constants 已导入 |
|
||||
| Device | `DeviceCardBindingResponse` + `status_name` | `device/binding.go` | 新增 constants import |
|
||||
| Asset | `AssetResolveResponse` + `status_name` | `buildDeviceResolveResponse` + `buildCardResolveResponse` | constants 已导入 |
|
||||
| Commission | `CommissionRecordResponse` + `status_name` | 未找到 service 调用(DTO 未被使用,ShopCommissionRecordItem 已有 status_name)| 仅 DTO 更新;同时修正了 description 错误 |
|
||||
| Client Asset | `AssetInfoResponse` + 4个 `_name` 字段 | handler `client_asset.go`(直接赋值)| constants 已导入 |
|
||||
| Client Order | `ClientOrderInfo/ListItem/DetailResponse` + `payment_status_name`; `ClientRechargeInfo` + `status_name` | `client_order/service.go` | 增加 `clientRechargeStatusName` 辅助函数 |
|
||||
| MyPackage | `MyPackageResponse/DetailResponse` + `status_name`/`shelf_status_name`; `MySeriesAllocationResponse` + `status_name` | 未找到 service 调用,仅 DTO 更新 | |
|
||||
|
||||
### 关键发现
|
||||
1. `CommissionRecordResponse.status` description 原先错误(写的 "1:已入账" 但常量是 "1:已冻结"),已修正为正确值
|
||||
2. `ClientRechargeInfo.Status` 使用的是 `rechargeStatusToClientStatus()` 转换后的值(0/1/2),与 RechargeStatus* 常量不同
|
||||
3. 部分 DTO(MyPackage、CommissionRecord)未被 service 层引用,仅更新 DTO 定义
|
||||
4. `DeviceResponse` 和 `ImportTaskResponse` 已经有 `status_name` 和 `status_text` 字段,无需修改
|
||||
|
||||
### 验证结果
|
||||
- ✅ `go build ./cmd/api ./cmd/worker` 通过,无任何错误
|
||||
691
.sisyphus/plans/realname-trigger-priority-enhancement.md
Normal file
691
.sisyphus/plans/realname-trigger-priority-enhancement.md
Normal file
@@ -0,0 +1,691 @@
|
||||
# realname-trigger-priority-enhancement 执行计划
|
||||
|
||||
## TL;DR
|
||||
|
||||
> **快速摘要**:修复手动触发去重TTL不对齐、日限制过低两个Bug,并在C端实名链接接口中异步触发优先级检查,减少用户等待时间。
|
||||
>
|
||||
> **交付物**:
|
||||
> - `pkg/config/` 新增 PollingAutoTriggerConfig 配置结构
|
||||
> - `internal/service/polling/manual_trigger_service.go` 修复3处日限制(100→500)、2处TTL(1h→24h)、提取权限检查公共函数、增强错误日志
|
||||
> - `internal/handler/app/client_realname.go` 新增异步触发逻辑(含2个辅助方法提取)
|
||||
> - `internal/bootstrap/handlers.go`、`cmd/api/docs.go`、`cmd/gendocs/main.go` 依赖注入接线
|
||||
> - `pkg/constants/redis.go` 注释同步更新
|
||||
>
|
||||
> **预计工作量**:60-90 分钟
|
||||
> **关键路径**:配置 → ManualTriggerService修复 → Handler集成 → 依赖注入接线 → 手动验证
|
||||
|
||||
---
|
||||
|
||||
## 上下文
|
||||
|
||||
### 原始需求
|
||||
|
||||
用户在C端主动获取实名跳转链接后,需等待轮询系统定时检查(30秒-5分钟间隔)才能检测到实名状态变化。同时手动触发功能存在两个Bug:去重key TTL(1小时)与日限制周期(24小时)不对齐,以及日限制次数(100次)过低导致正常使用受限。
|
||||
|
||||
### 代码库现状(已验证)
|
||||
|
||||
| 项目 | 状态 |
|
||||
|------|------|
|
||||
| `constants.TaskTypePollingRealname` | ✅ 已存在:`"polling:realname"`(constants.go:55) |
|
||||
| `svc.PollingManualTrigger` in bootstrap | ✅ 已初始化(services.go:210) |
|
||||
| 日限制 `>= 100` 位置 | **3处**:manual_trigger_service.go:58, 129, 238 |
|
||||
| `Expire(..., time.Hour)` 位置 | **2处**:manual_trigger_service.go:72(TriggerSingle)和 :192(processBatchTrigger) |
|
||||
| `NewClientRealnameHandler` 当前参数数 | 7个 → 改后8个 |
|
||||
| docs.go / gendocs/main.go 调用处 | 各1处,7个nil → 8个nil |
|
||||
| `GetRealnameLink` 当前行数 | **127行**(已超100行限制,需提取辅助方法) |
|
||||
| 系统用户 | 暂用 SuperAdmin ID=1,使用 UserTypePlatform 身份 |
|
||||
|
||||
### 关键设计决策
|
||||
|
||||
1. **goroutine 异步触发**:使用 `context.WithTimeout(context.Background(), 3s)` 独立 context,**禁止**复用 `c.UserContext()`(Fiber 请求 context 在 handler 返回后失效)
|
||||
2. **系统用户身份**:`UserTypePlatform`(非 UserTypeSuperAdmin),既绕过卡归属权限检查,又仍受500次/天限制约束
|
||||
3. **goroutine 参数**:只传标量值(uint、string),**绝对不捕获 `c *fiber.Ctx` 或任何指针**
|
||||
4. **GetRealnameLink 行数**:当前127行已超限,需在 Task 4 中额外提取两个 helper(已批准)
|
||||
5. **processBatchTrigger TTL**:两处都修(已确认)
|
||||
6. **Commit 3 临时编译失败**:Task 4 修改构造函数后、Task 5 接线前,全量编译会报错,只做文件级 LSP 检查
|
||||
|
||||
---
|
||||
|
||||
## Phase 0 — 现状分析
|
||||
|
||||
### Task 1.1 — LSP 基线诊断
|
||||
|
||||
**操作**:对以下两个文件运行 `lsp_diagnostics`:
|
||||
- `internal/handler/app/client_realname.go`
|
||||
- `internal/service/polling/manual_trigger_service.go`
|
||||
|
||||
**目的**:建立干净基线,区分预存问题与本次引入的问题
|
||||
|
||||
**验收**:记录所有预存 warning,确认无预存 error
|
||||
|
||||
---
|
||||
|
||||
### Task 1.2 — 依赖关系确认
|
||||
|
||||
**操作**:
|
||||
- 确认 `handler/app → service/polling` 无循环依赖(polling service 不导入 handler 包)
|
||||
- 确认 `internal/bootstrap/handlers.go` 已有 `pollingSvcPkg` import alias
|
||||
|
||||
**验收**:无循环依赖,`svc.PollingManualTrigger` 在 bootstrap 中可访问
|
||||
|
||||
---
|
||||
|
||||
## Phase 1 — 配置管理
|
||||
|
||||
### Task 2.1 — 新增配置结构体和字段
|
||||
|
||||
**文件**:`pkg/config/config.go`
|
||||
|
||||
新增结构体(放在其他 Config 结构体附近):
|
||||
```go
|
||||
// PollingAutoTriggerConfig 轮询自动触发配置
|
||||
type PollingAutoTriggerConfig struct {
|
||||
// EnableAutoTrigger 是否启用C端实名自动触发
|
||||
// 环境变量:JUNHONG_POLLING_AUTO_TRIGGER_ENABLE_AUTO_TRIGGER
|
||||
EnableAutoTrigger bool `mapstructure:"enable_auto_trigger"`
|
||||
// AutoTriggerSystemUserID 自动触发使用的系统用户ID(暂用 SuperAdmin ID=1)
|
||||
// 环境变量:JUNHONG_POLLING_AUTO_TRIGGER_AUTO_TRIGGER_SYSTEM_USER_ID
|
||||
AutoTriggerSystemUserID int `mapstructure:"auto_trigger_system_user_id"`
|
||||
}
|
||||
```
|
||||
|
||||
在 `Config` struct 中添加字段(位置:Gateway 字段之后):
|
||||
```go
|
||||
PollingAutoTrigger PollingAutoTriggerConfig `mapstructure:"polling_auto_trigger"`
|
||||
```
|
||||
|
||||
**陷阱**:不要在 `Validate()` 中添加校验——零值(false/0)是合法默认值
|
||||
|
||||
**验收**:结构体定义正确,mapstructure tag 与 yaml key 对应
|
||||
|
||||
---
|
||||
|
||||
### Task 2.2 — 更新默认配置 YAML
|
||||
|
||||
**文件**:`pkg/config/defaults/config.yaml`
|
||||
|
||||
在文件末尾添加(保留尾部换行):
|
||||
```yaml
|
||||
# 轮询自动触发配置
|
||||
polling_auto_trigger:
|
||||
enable_auto_trigger: true
|
||||
auto_trigger_system_user_id: 1 # 暂用 SuperAdmin,生产环境建议创建专用平台账号并更新此值
|
||||
```
|
||||
|
||||
对应环境变量:
|
||||
- `JUNHONG_POLLING_AUTO_TRIGGER_ENABLE_AUTO_TRIGGER`
|
||||
- `JUNHONG_POLLING_AUTO_TRIGGER_AUTO_TRIGGER_SYSTEM_USER_ID`
|
||||
|
||||
**验收**:config.Get().PollingAutoTrigger.EnableAutoTrigger 默认为 true
|
||||
|
||||
---
|
||||
|
||||
### Task 2.3 — LSP 检查配置
|
||||
|
||||
**操作**:`lsp_diagnostics` 对 `pkg/config/config.go`
|
||||
|
||||
**验收**:0 error
|
||||
|
||||
---
|
||||
|
||||
## Phase 2 — 手动触发服务 Bug 修复
|
||||
|
||||
### Task 3.1 — 日限制 100 → 500(3处)
|
||||
|
||||
**文件**:`internal/service/polling/manual_trigger_service.go`
|
||||
|
||||
| 行号 | 修改内容 |
|
||||
|------|---------|
|
||||
| 58 | `todayCount >= 100` → `todayCount >= 500`,同步更新行内注释 `// 每日最多触发100次` → `// 每日最多触发500次` |
|
||||
| 129 | `todayCount >= 100` → `todayCount >= 500`,补充注释 `// 每日最多触发500次` |
|
||||
| 238 | `todayCount >= 100` → `todayCount >= 500`,补充注释 `// 每日最多触发500次` |
|
||||
|
||||
**验收**:`grep -n "100" manual_trigger_service.go` 无日限制相关残留
|
||||
|
||||
---
|
||||
|
||||
### Task 3.2 — 去重 TTL 1h → 24h(2处)
|
||||
|
||||
**文件**:`internal/service/polling/manual_trigger_service.go`
|
||||
|
||||
| 行号 | 修改内容 |
|
||||
|------|---------|
|
||||
| 71-72 | 注释改为 `// 设置去重 key 过期时间(24小时,与日限制周期对齐)`;`time.Hour` → `24*time.Hour` |
|
||||
| 191-192 | 同上(processBatchTrigger 中,存在相同 Bug,一并修复) |
|
||||
|
||||
**验收**:`grep -n "time.Hour" manual_trigger_service.go` 无残留
|
||||
|
||||
---
|
||||
|
||||
### Task 3.3 — 同步 Redis 常量注释
|
||||
|
||||
**文件**:`pkg/constants/redis.go`
|
||||
|
||||
找到 `RedisPollingManualDedupeKey` 函数注释,将:
|
||||
```
|
||||
// 过期时间:1小时
|
||||
```
|
||||
改为:
|
||||
```
|
||||
// 过期时间:24小时(与日限制周期对齐)
|
||||
```
|
||||
|
||||
**验收**:注释与实际 TTL 一致
|
||||
|
||||
---
|
||||
|
||||
### Task 3.4 — 提取公共权限检查函数
|
||||
|
||||
**文件**:`internal/service/polling/manual_trigger_service.go`
|
||||
|
||||
从 `canManageCard`、`canManageCards`、`applyShopPermissionFilter` 三处提取重复的用户类型检查,新增私有方法:
|
||||
|
||||
```go
|
||||
// checkUserTypePermission 检查用户类型是否有手动触发权限
|
||||
// 返回 skip=true 表示超级管理员/平台用户直接放行
|
||||
// 返回 err!=nil 表示企业账号无权限
|
||||
// 返回 skip=false, err=nil 表示代理账号需继续细粒度检查
|
||||
func (s *ManualTriggerService) checkUserTypePermission(ctx context.Context) (skip bool, err error) {
|
||||
userType := middleware.GetUserTypeFromContext(ctx)
|
||||
if userType == constants.UserTypeSuperAdmin || userType == constants.UserTypePlatform {
|
||||
return true, nil
|
||||
}
|
||||
if userType == constants.UserTypeEnterprise {
|
||||
return false, errors.New(errors.CodeForbidden, "企业账号无权限手动触发轮询")
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
```
|
||||
|
||||
三个调用方改为:
|
||||
```go
|
||||
skip, err := s.checkUserTypePermission(ctx)
|
||||
if err != nil || skip {
|
||||
return err // canManageCard 签名
|
||||
}
|
||||
```
|
||||
|
||||
**陷阱**:`applyShopPermissionFilter` 中超管分支有 filter 对象逻辑,只提取类型检查部分,不删除 filter 修改逻辑
|
||||
|
||||
**验收**:三个函数各减少约5行重复代码,行为不变
|
||||
|
||||
---
|
||||
|
||||
### Task 3.5 — 改进 TriggerSingle 错误日志
|
||||
|
||||
**文件**:`internal/service/polling/manual_trigger_service.go`
|
||||
|
||||
在 `TriggerSingle` 每条 `return err` 路径前补充结构化日志,字段要求:
|
||||
|
||||
| 错误场景 | 必须包含字段 |
|
||||
|---------|------------|
|
||||
| 查询今日触发次数失败 | `triggered_by`、`task_type`、`error` |
|
||||
| Redis去重操作失败 | `card_id`、`task_type`、`error` |
|
||||
| 创建触发日志失败 | `card_id`、`triggered_by`、`error` |
|
||||
| 写入队列失败 | `card_id`、`task_type`、`error` |
|
||||
|
||||
**验收**:每条 return err 路径有对应日志,级别为 Error
|
||||
|
||||
---
|
||||
|
||||
### Task 3.6 — LSP 检查
|
||||
|
||||
**操作**:`lsp_diagnostics` 对 `internal/service/polling/manual_trigger_service.go`
|
||||
|
||||
**验收**:0 error,0 新增 warning
|
||||
|
||||
---
|
||||
|
||||
### Task 3.7 — 手动验证去重 + 限制
|
||||
|
||||
**操作**(通过 Redis CLI 或 PostgreSQL MCP):
|
||||
|
||||
```bash
|
||||
# 1. 触发某张卡,验证 TTL 为 24小时
|
||||
redis-cli TTL polling:manual:dedupe:polling:realname
|
||||
# 期望:≈ 86400
|
||||
|
||||
# 2. 再次触发同一张卡,验证被拒绝
|
||||
# 期望返回:"该卡已在手动触发队列中"
|
||||
|
||||
# 3. 删除 dedupe key 后重新触发,验证成功
|
||||
redis-cli DEL polling:manual:dedupe:polling:realname
|
||||
```
|
||||
|
||||
```sql
|
||||
-- 验证今日触发次数计数正确
|
||||
SELECT COUNT(*) as today_count
|
||||
FROM tb_polling_manual_trigger_log
|
||||
WHERE DATE(triggered_at) = CURRENT_DATE;
|
||||
```
|
||||
|
||||
**验收**:TTL ≈ 86400,重复触发被拒绝,DB 计数正确
|
||||
|
||||
---
|
||||
|
||||
## Phase 3 — Handler 集成
|
||||
|
||||
### Task 4.1 — 结构体新增字段
|
||||
|
||||
**文件**:`internal/handler/app/client_realname.go`
|
||||
|
||||
添加 import(注意区分 `internal/service/polling` 与 `internal/polling` 是不同包):
|
||||
```go
|
||||
pollingSvc "github.com/xxx/junhong_cmp_fiber/internal/service/polling"
|
||||
```
|
||||
|
||||
在 `ClientRealnameHandler` 结构体新增字段:
|
||||
```go
|
||||
manualTriggerSvc *pollingSvc.ManualTriggerService // 手动触发服务(可为nil,nil时跳过自动触发)
|
||||
```
|
||||
|
||||
**验收**:结构体字段添加正确,import 路径正确
|
||||
|
||||
---
|
||||
|
||||
### Task 4.2 — 修改构造函数(第8个参数)
|
||||
|
||||
**文件**:`internal/handler/app/client_realname.go`
|
||||
|
||||
在 `NewClientRealnameHandler` 末尾新增参数:
|
||||
```go
|
||||
func NewClientRealnameHandler(
|
||||
// ...现有7个参数保持不变...
|
||||
manualTriggerSvc *pollingSvc.ManualTriggerService, // 可为nil
|
||||
) *ClientRealnameHandler {
|
||||
return &ClientRealnameHandler{
|
||||
// ...现有字段初始化...
|
||||
manualTriggerSvc: manualTriggerSvc,
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**陷阱**:修改后 `docs.go`、`gendocs/main.go`、`bootstrap/handlers.go` 会出现编译错误(构造函数参数不一致),待 Task 5 修复。此阶段**只做文件级** LSP 检查,不跑全量 build
|
||||
|
||||
**验收**:`client_realname.go` 本身 LSP 0 error
|
||||
|
||||
---
|
||||
|
||||
### Task 4.3 — 提取辅助方法(解决 GetRealnameLink 行数超限问题)
|
||||
|
||||
**文件**:`internal/handler/app/client_realname.go`
|
||||
|
||||
**背景**:当前 `GetRealnameLink` 127行,加 goroutine 代码约133行,违反 ≤100行规范。需提取两个私有方法。
|
||||
|
||||
**提取1:`resolveTargetCard`**(资产类型 switch 分支,约26行):
|
||||
```go
|
||||
// resolveTargetCard 根据资产类型和ICCID定位目标卡
|
||||
// 支持三条路径:直接卡资产、设备+指定ICCID、设备取第一张绑定卡
|
||||
func (h *ClientRealnameHandler) resolveTargetCard(c *fiber.Ctx, asset *assetService.ResolvedAsset, iccid string) (*model.IotCard, error) {
|
||||
switch {
|
||||
case asset.AssetType == "card":
|
||||
// ...
|
||||
case asset.AssetType == "device" && iccid != "":
|
||||
// ...
|
||||
case asset.AssetType == "device":
|
||||
// ...
|
||||
default:
|
||||
return nil, errors.New(errors.CodeInvalidParam, "不支持的资产类型")
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**提取2:`buildRealnameResponse`**(运营商 URL 调度,约32行):
|
||||
```go
|
||||
// buildRealnameResponse 根据运营商实名链接类型构建响应
|
||||
func (h *ClientRealnameHandler) buildRealnameResponse(ctx context.Context, card *model.IotCard, carrier *model.Carrier) (*dto.RealnimeLinkResponse, error) {
|
||||
// switch carrier.RealnameLinkType { ... }
|
||||
}
|
||||
```
|
||||
|
||||
提取后 `GetRealnameLink` ≈70行,加 goroutine 后 ≈76行 ✅
|
||||
|
||||
**陷阱**:
|
||||
- `resolveTargetCard` 需要 `c *fiber.Ctx`(子函数调用需要 Fiber context)
|
||||
- `buildRealnameResponse` 用 `ctx context.Context`(只调 gatewayClient)
|
||||
- 确认 `assetService.ResolvedAsset` 的实际类型名称(读文件确认后再写)
|
||||
|
||||
**验收**:`GetRealnameLink` 函数体 ≤100行,两个新方法编译正常,逻辑不变
|
||||
|
||||
---
|
||||
|
||||
### Task 4.4 — 添加异步触发调用
|
||||
|
||||
**文件**:`internal/handler/app/client_realname.go`
|
||||
|
||||
添加 import:`"github.com/xxx/junhong_cmp_fiber/pkg/config"`
|
||||
|
||||
在 `GetRealnameLink` 中,成功构建响应之后、`response.Success(c, resp)` 之前插入:
|
||||
```go
|
||||
// 异步触发实名检查,提升检测优先级;失败不影响主流程
|
||||
if h.manualTriggerSvc != nil && config.Get().PollingAutoTrigger.EnableAutoTrigger {
|
||||
systemUserID := uint(config.Get().PollingAutoTrigger.AutoTriggerSystemUserID)
|
||||
go h.triggerRealnameCheck(targetCard.ID, customerID, targetCard.ICCID, systemUserID)
|
||||
}
|
||||
```
|
||||
|
||||
**强制约束**:goroutine 只传标量值(uint、string),**绝对不捕获 `c *fiber.Ctx` 或任何指针类型**
|
||||
|
||||
**验收**:goroutine 启动代码不捕获 Fiber context 相关变量
|
||||
|
||||
---
|
||||
|
||||
### Task 4.5 — 实现 triggerRealnameCheck 私有方法
|
||||
|
||||
**文件**:`internal/handler/app/client_realname.go`
|
||||
|
||||
添加 imports:`"context"`、`"time"`、`"github.com/xxx/junhong_cmp_fiber/pkg/middleware"`
|
||||
|
||||
```go
|
||||
// triggerRealnameCheck 异步触发单卡实名检查
|
||||
// 在独立 goroutine 中调用,使用独立 context 避免 Fiber 请求 context 失效问题
|
||||
// 参数全部为值类型,不捕获请求相关指针
|
||||
func (h *ClientRealnameHandler) triggerRealnameCheck(cardID, customerID uint, iccid string, systemUserID uint) {
|
||||
// 必须使用独立 context,禁止复用 Fiber 请求 context(请求返回后即失效)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||
defer cancel()
|
||||
|
||||
// 使用平台用户身份构建 context,绕过卡归属权限检查
|
||||
// 注意:使用 UserTypePlatform 而非 UserTypeSuperAdmin,SuperAdmin 不受日限制约束
|
||||
sysCtx := middleware.SetUserContext(ctx, &middleware.UserContextInfo{
|
||||
UserID: systemUserID,
|
||||
UserType: constants.UserTypePlatform,
|
||||
})
|
||||
|
||||
err := h.manualTriggerSvc.TriggerSingle(sysCtx, cardID, constants.TaskTypePollingRealname, systemUserID)
|
||||
if err != nil {
|
||||
h.logger.Warn("自动触发实名检查失败",
|
||||
zap.Uint("customer_id", customerID),
|
||||
zap.String("iccid", iccid),
|
||||
zap.Uint("card_id", cardID),
|
||||
zap.Error(err))
|
||||
return
|
||||
}
|
||||
h.logger.Info("自动触发实名检查成功",
|
||||
zap.Uint("customer_id", customerID),
|
||||
zap.String("iccid", iccid),
|
||||
zap.Uint("card_id", cardID))
|
||||
}
|
||||
```
|
||||
|
||||
**验收**:方法 ≤30行,使用 `context.Background()`,context 注入 UserTypePlatform,日志字段完整
|
||||
|
||||
---
|
||||
|
||||
### Task 4.6 — 日志字段核查
|
||||
|
||||
**检查清单**:
|
||||
- [x] WARN 路径包含:`customer_id`、`iccid`、`card_id`、`error`
|
||||
- [x] INFO 路径包含:`customer_id`、`iccid`、`card_id`
|
||||
- [x] 无 nil panic 风险(err 已检查)
|
||||
- [x] goroutine 无 panic 风险(manualTriggerSvc 已在调用前检查非 nil)
|
||||
|
||||
**验收**:所有字段齐全,无潜在 panic
|
||||
|
||||
---
|
||||
|
||||
### Task 4.7 — LSP 检查 Handler 文件
|
||||
|
||||
**操作**:`lsp_diagnostics` 对 `internal/handler/app/client_realname.go`
|
||||
|
||||
**注意**:此时 `bootstrap/handlers.go`、`docs.go`、`gendocs/main.go` 仍有编译错误(待 Task 5),只关注 `client_realname.go` 自身
|
||||
|
||||
**验收**:`client_realname.go` 自身 0 error
|
||||
|
||||
---
|
||||
|
||||
## Phase 4 — 依赖注入接线
|
||||
|
||||
### Task 5.1 — 更新 bootstrap/handlers.go
|
||||
|
||||
**文件**:`internal/bootstrap/handlers.go`
|
||||
|
||||
找到 `ClientRealname` 初始化行,在末尾补充 `svc.PollingManualTrigger` 参数:
|
||||
|
||||
```go
|
||||
// 修改前(7个参数)
|
||||
ClientRealname: app.NewClientRealnameHandler(
|
||||
svc.Asset, personalCustomerDeviceStore, iotCardStore,
|
||||
deviceSimBindingStore, carrierStore, deps.GatewayClient, deps.Logger,
|
||||
),
|
||||
|
||||
// 修改后(8个参数)
|
||||
ClientRealname: app.NewClientRealnameHandler(
|
||||
svc.Asset, personalCustomerDeviceStore, iotCardStore,
|
||||
deviceSimBindingStore, carrierStore, deps.GatewayClient, deps.Logger,
|
||||
svc.PollingManualTrigger,
|
||||
),
|
||||
```
|
||||
|
||||
**验收**:`svc.PollingManualTrigger` 类型匹配(已在 services.go:210 初始化)
|
||||
|
||||
---
|
||||
|
||||
### Task 5.2 — 确认 ManualTriggerService 初始化(只读)
|
||||
|
||||
**操作**:确认 `internal/bootstrap/services.go:210` 已有:
|
||||
```go
|
||||
PollingManualTrigger: pollingSvc.NewManualTriggerService(...)
|
||||
```
|
||||
|
||||
**无需变更**,仅确认
|
||||
|
||||
**验收**:`svc.PollingManualTrigger` 非 nil
|
||||
|
||||
---
|
||||
|
||||
### Task 5.3 — 更新 docs.go 和 gendocs/main.go
|
||||
|
||||
**文件**:`cmd/api/docs.go` 和 `cmd/gendocs/main.go`
|
||||
|
||||
两处均将 `NewClientRealnameHandler` 调用从 7个nil 改为 8个nil:
|
||||
|
||||
```go
|
||||
// 修改前
|
||||
handlers.ClientRealname = apphandler.NewClientRealnameHandler(nil, nil, nil, nil, nil, nil, nil)
|
||||
|
||||
// 修改后
|
||||
handlers.ClientRealname = apphandler.NewClientRealnameHandler(nil, nil, nil, nil, nil, nil, nil, nil)
|
||||
```
|
||||
|
||||
**验收**:两个文件均编译通过
|
||||
|
||||
---
|
||||
|
||||
### Task 5.4 — LSP 检查依赖注入相关文件
|
||||
|
||||
**操作**:`lsp_diagnostics` 对以下3个文件:
|
||||
- `internal/bootstrap/handlers.go`
|
||||
- `cmd/api/docs.go`
|
||||
- `cmd/gendocs/main.go`
|
||||
|
||||
**验收**:全部 0 error
|
||||
|
||||
---
|
||||
|
||||
## Phase 5 — 手动验证
|
||||
|
||||
### Task 6.1 — 接口调用验证 goroutine 启动
|
||||
|
||||
```bash
|
||||
curl -H "Authorization: Bearer <token>" \
|
||||
"http://localhost:3000/api/c/v1/realname/link?identifier=<iccid>"
|
||||
```
|
||||
|
||||
**查看 app.log** 确认出现:
|
||||
```json
|
||||
{"level":"info","msg":"自动触发实名检查成功","customer_id":...,"iccid":"...","card_id":...}
|
||||
```
|
||||
|
||||
**验收**:响应正常返回实名链接,日志在响应后3秒内出现
|
||||
|
||||
---
|
||||
|
||||
### Task 6.2 — DB 验证触发记录
|
||||
|
||||
```sql
|
||||
SELECT triggered_by, task_type, total_count, status, created_at
|
||||
FROM tb_polling_manual_trigger_log
|
||||
WHERE triggered_by = 1
|
||||
ORDER BY id DESC LIMIT 5;
|
||||
```
|
||||
|
||||
**期望**:`triggered_by = 1`(SuperAdmin),`task_type = 'polling:realname'`,`total_count = 1`
|
||||
|
||||
**验收**:记录存在且字段正确
|
||||
|
||||
---
|
||||
|
||||
### Task 6.3 — Redis 队列验证
|
||||
|
||||
```bash
|
||||
redis-cli LRANGE polling:manual:polling:realname 0 -1
|
||||
```
|
||||
|
||||
**期望**:卡 ID 存在于队列中
|
||||
|
||||
**验收**:队列条目可见
|
||||
|
||||
---
|
||||
|
||||
### Task 6.4 — 日限制计数验证
|
||||
|
||||
```sql
|
||||
SELECT COUNT(*) as today_count
|
||||
FROM tb_polling_manual_trigger_log
|
||||
WHERE triggered_by = 1
|
||||
AND DATE(triggered_at) = CURRENT_DATE;
|
||||
```
|
||||
|
||||
**期望**:计数正确,未超过500
|
||||
|
||||
**验收**:计数准确
|
||||
|
||||
---
|
||||
|
||||
### Task 6.5 — Redis 去重 TTL 验证
|
||||
|
||||
```bash
|
||||
redis-cli TTL polling:manual:dedupe:polling:realname
|
||||
```
|
||||
|
||||
**期望**:≈ 86400(24小时)
|
||||
|
||||
**验收**:TTL 约等于 86400
|
||||
|
||||
---
|
||||
|
||||
### Task 6.6 — 功能开关验证
|
||||
|
||||
设置 `JUNHONG_POLLING_AUTO_TRIGGER_ENABLE_AUTO_TRIGGER=false` 后重启服务,调用接口:
|
||||
|
||||
**期望**:正常返回实名链接,app.log 无自动触发相关日志,DB 无新增触发记录,无 panic
|
||||
|
||||
**验收**:功能开关有效,主流程不受影响
|
||||
|
||||
---
|
||||
|
||||
## Phase 6 — 最终验收
|
||||
|
||||
### Task 7.1 — 全文件 LSP 最终扫描
|
||||
|
||||
对所有修改过的文件运行 `lsp_diagnostics`:
|
||||
- `internal/handler/app/client_realname.go`
|
||||
- `internal/service/polling/manual_trigger_service.go`
|
||||
- `internal/bootstrap/handlers.go`
|
||||
- `pkg/constants/redis.go`
|
||||
- `pkg/config/config.go`
|
||||
- `cmd/api/docs.go`
|
||||
- `cmd/gendocs/main.go`
|
||||
|
||||
**验收**:全部 0 error,0 新增 warning
|
||||
|
||||
---
|
||||
|
||||
### Task 7.2 — 环境变量文档记录
|
||||
|
||||
确认以下环境变量已在部署文档中记录:
|
||||
|
||||
| 环境变量 | 默认值 | 说明 |
|
||||
|---------|-------|------|
|
||||
| `JUNHONG_POLLING_AUTO_TRIGGER_ENABLE_AUTO_TRIGGER` | `true` | 自动触发开关,可临时关闭 |
|
||||
| `JUNHONG_POLLING_AUTO_TRIGGER_AUTO_TRIGGER_SYSTEM_USER_ID` | `1` | 暂用 SuperAdmin。**生产环境建议创建专用平台账号(user_type=Platform)并更新此值** |
|
||||
|
||||
**验收**:文档中有上述两个环境变量的说明
|
||||
|
||||
---
|
||||
|
||||
### Task 7.3 — GetRealnameLink 行数确认
|
||||
|
||||
统计 `GetRealnameLink` 函数体行数(从 `func` 到最后一个 `}`):
|
||||
|
||||
**验收**:≤ 100 行
|
||||
|
||||
---
|
||||
|
||||
## 原子提交策略
|
||||
|
||||
| 提交顺序 | 涵盖文件 | Commit Message |
|
||||
|---------|---------|---------------|
|
||||
| Commit 1 | `pkg/config/config.go`、`pkg/config/defaults/config.yaml` | `feat: 新增轮询自动触发配置(EnableAutoTrigger、AutoTriggerSystemUserID)` |
|
||||
| Commit 2 | `internal/service/polling/manual_trigger_service.go`、`pkg/constants/redis.go` | `fix: 修复手动触发去重TTL和日限制次数,优化权限检查和错误日志` |
|
||||
| Commit 3 | `internal/handler/app/client_realname.go` | `feat: ClientRealnameHandler 集成异步触发实名检查` |
|
||||
| Commit 4 | `internal/bootstrap/handlers.go`、`cmd/api/docs.go`、`cmd/gendocs/main.go` | `feat: 更新依赖注入,传入 ManualTriggerService` |
|
||||
|
||||
> ⚠️ Commit 3 之后、Commit 4 完成之前,全量编译会报错(构造函数参数不一致)。只做文件级 LSP 检查,不跑全量 build。
|
||||
|
||||
---
|
||||
|
||||
## 风险清单
|
||||
|
||||
| 风险 | 级别 | 对策 |
|
||||
|------|------|------|
|
||||
| goroutine 捕获 `c *fiber.Ctx` 导致 use-after-free | **致命** | `triggerRealnameCheck` 只接受标量参数(uint、string) |
|
||||
| GetRealnameLink 超 100 行 | 高 | Task 4.3 提取两个 helper(已批准) |
|
||||
| processBatchTrigger TTL 漏修 | 中 | Task 3.2 明确修复两处(已确认) |
|
||||
| SuperAdmin(ID=1) 与其他系统进程共享日限额 | 低 | 生产环境创建专用账号后更新配置 |
|
||||
| Commit 3 后临时全量编译失败 | 预期行为 | 文件级 LSP 即可,Task 5 完成后全量恢复 |
|
||||
| `assetService.ResolvedAsset` 实际类型名称不确定 | 低 | Task 4.3 执行前先读文件确认类型名 |
|
||||
|
||||
---
|
||||
|
||||
## 提案 tasks.md 更新规则
|
||||
|
||||
**文件**:`openspec/changes/realname-trigger-priority-enhancement/tasks.md`
|
||||
|
||||
每完成一个 Phase 后,必须将对应条目从 `- [ ]` 改为 `- [x]`。对应关系如下:
|
||||
|
||||
| 本计划 Phase/Task | 提案 tasks.md 条目 |
|
||||
|-----------------|------------------|
|
||||
| Task 1.1 完成 | `1.1 使用 lsp_diagnostics 检查...` |
|
||||
| Task 1.2 完成 | `1.2 分析现有 ClientRealnameHandler...` |
|
||||
| Task 2.1 完成 | `2.1 在 pkg/config/ 中新增...` |
|
||||
| Task 2.2 完成 | `2.2 更新 pkg/config/defaults/config.yaml...` |
|
||||
| Task 2.3 完成 | `2.3 运行 lsp_diagnostics 检查配置...` |
|
||||
| Task 3.1 完成 | `3.1 ...三处将 todayCount >= 100 改为...` |
|
||||
| Task 3.2 完成 | `3.2 ...将 s.redis.Expire(ctx, dedupeKey, time.Hour) 改为...` |
|
||||
| Task 3.3 完成 | `3.3 同步更新 pkg/constants/redis.go...` |
|
||||
| Task 3.4 完成 | `3.4 优化 canManageCard 和 canManageCards...` |
|
||||
| Task 3.5 完成 | `3.5 改进 TriggerSingle 的错误日志...` |
|
||||
| Task 3.6 完成 | `3.6 运行 lsp_diagnostics 检查 ManualTriggerService...` |
|
||||
| Task 3.7 完成 | `3.7 使用 PostgreSQL MCP 和 Redis CLI 手动验证...` |
|
||||
| Task 4.1–4.2 完成 | `4.1 在 ClientRealnameHandler 结构体中新增...` + `4.2 修改 NewClientRealnameHandler...` |
|
||||
| Task 4.3 完成(提取 helper) | — (本计划新增步骤,提案无对应条目) |
|
||||
| Task 4.4–4.5 完成 | `4.3 在 GetRealnameLink 成功返回...` + `4.4 goroutine 内部必须使用...` + `4.5 goroutine 内部构造系统用户 context...` |
|
||||
| Task 4.6 完成 | `4.6 goroutine 执行失败时记录 WARN 日志...` |
|
||||
| Task 4.7 完成 | `4.7 运行 lsp_diagnostics 检查 ClientRealnameHandler...` |
|
||||
| Task 5.1 完成 | `5.1 在 internal/bootstrap/handlers.go 中更新...` |
|
||||
| Task 5.2 完成 | `5.2 确认 ManualTriggerService 在 bootstrap/services.go 中已初始化...` |
|
||||
| Task 5.3 完成 | `5.3 更新 cmd/api/docs.go 和 cmd/gendocs/main.go...` |
|
||||
| Task 5.4 完成 | `5.4 运行 lsp_diagnostics 检查 bootstrap 和 docs.go...` |
|
||||
| Task 6.1 完成 | `6.1 使用 curl 调用...` |
|
||||
| Task 6.2 完成 | `6.2 通过 PostgreSQL MCP 查询 tb_polling_manual_trigger_log...` |
|
||||
| Task 6.3 完成 | `6.3 通过 Redis CLI 检查 polling:manual:realname 队列...` |
|
||||
| Task 6.4 完成 | `6.4 使用 PostgreSQL MCP 查询今日触发次数...` |
|
||||
| Task 6.5 完成 | `6.5 使用 Redis CLI 确认 dedup key TTL 为 24 小时...` |
|
||||
| Task 6.6 完成 | `6.6 模拟 manualTriggerSvc 不可用场景...` |
|
||||
| Task 7.1 完成 | `7.1 运行 lsp_diagnostics 对所有修改过的文件...` |
|
||||
| Task 7.2 完成 | `7.2 确认环境变量...已在部署文档中记录` |
|
||||
| Task 7.3 完成 | `7.3 确认 GetRealnameLink handler 函数长度不超过 100 行` |
|
||||
|
||||
**更新方式**:直接编辑 `tasks.md`,将对应行的 `- [ ]` 替换为 `- [x]`。每个 Phase 执行完毕后集中更新该 Phase 所有条目,不要跨 Phase 提前勾选。
|
||||
108
.sisyphus/plans/tech-debt-cleanup.md
Normal file
108
.sisyphus/plans/tech-debt-cleanup.md
Normal file
@@ -0,0 +1,108 @@
|
||||
# tech-debt-cleanup 执行计划
|
||||
|
||||
## TL;DR
|
||||
|
||||
> **快速摘要**:清理项目技术债务:API 文档补全(18.75% → 100%)、支付配置动态化、轮询常量提取、废弃代码清理、Model 字段清理、DTO _name 字段补全、数据库迁移基线合并。
|
||||
>
|
||||
> **提案文件**:`openspec/changes/tech-debt-cleanup/`
|
||||
|
||||
---
|
||||
|
||||
## TODOs
|
||||
|
||||
### Task 1: 支付配置动态加载(pkg/payment + service层)
|
||||
|
||||
- [x] 1.1 在 `pkg/constants/redis.go` 中新增 `RedisPaymentConfigKey(configID uint) string` 函数
|
||||
- [x] 1.2 确认 `pkg/payment/` 包中现有支付接口定义
|
||||
- [x] 1.3 创建 `pkg/payment/loader.go`,定义 `PaymentConfigLoader` 接口和实现(Redis 缓存 TTL 1h)
|
||||
- [x] 1.4 修改 `internal/service/order/service.go`,注入 paymentLoader,替换两处 TODO
|
||||
- [x] 1.5 修改 `internal/service/recharge/service.go`,注入 paymentLoader,替换 TODO
|
||||
- [x] 1.7 运行 `go build ./cmd/api ./cmd/worker` 确认编译,`go vet` 静态分析
|
||||
|
||||
### Task 2: API 文档生成器补全(docs.go + gendocs)
|
||||
|
||||
- [x] 2.1 修改 `cmd/api/docs.go`,注册所有 48 个 Handler(含 39 个缺失 Handler)
|
||||
- [x] 2.2 修改 `cmd/gendocs/main.go`,同步注册所有 48 个 Handler
|
||||
- [x] 2.3 运行 `go run cmd/gendocs/main.go` 生成 OpenAPI 文档,验证覆盖率
|
||||
- [x] 2.4 人工核查生成文档接口数量与路由注册数量一致
|
||||
|
||||
### Task 3: 轮询状态常量提取(pkg/constants + handler/service/store)
|
||||
|
||||
- [x] 3.1 在 `pkg/constants/polling.go` 中新增轮询手动触发日志状态常量(4 个)
|
||||
- [x] 3.2 修改 `internal/handler/admin/polling_manual_trigger.go`,替换硬编码字符串为常量
|
||||
- [x] 3.3 修改 `internal/service/polling/manual_trigger_service.go`,替换硬编码字符串
|
||||
- [x] 3.4 修改 `internal/store/postgres/polling_manual_trigger_store.go`,替换硬编码字符串
|
||||
- [x] 3.5 修改 `internal/service/polling/alert_service.go`,替换 NotificationStatus 中的硬编码
|
||||
- [x] 3.6 运行 grep 确认无剩余硬编码,`go vet` 静态分析
|
||||
|
||||
### Task 4: 废弃代码清理(sync.go + wallet.go + DTO + 方法)
|
||||
|
||||
- [x] 4.1 删除 `internal/task/sync.go`,清理 queue/handler.go 注册和 constants.go 中的 TaskTypeDataSync
|
||||
- [x] 4.2 全局搜索 wallet.go 中 15 个废弃别名的引用情况
|
||||
- [x] 4.3 替换所有有引用的废弃别名为新常量
|
||||
- [x] 4.4 删除 `pkg/constants/wallet.go` 中所有 Deprecated 别名定义(15 个)
|
||||
- [x] 4.5 删除 `internal/model/dto/enterprise_card_authorization_dto.go` 中的 3 个废弃 DTO 类型
|
||||
- [x] 4.6 删除 `internal/service/order/service.go` 中的 `CreateLegacy()` 方法
|
||||
- [x] 4.7 [跳过] `CheckAndStopCard()` 仍在 StopResumeServiceInterface 接口中且被活跃调用,不是废弃代码
|
||||
- [x] 4.8 运行 `go build ./cmd/api ./cmd/worker` 和 `go vet` 确认编译无误
|
||||
|
||||
### Task 5: Model 废弃字段删除与数据库迁移
|
||||
|
||||
- [x] 5.1 从 `internal/model/iot_card.go` 中删除 `FirstCommissionPaid` 和 `AccumulatedRecharge` 字段
|
||||
- [x] 5.2 从 `internal/model/device.go` 中删除 `FirstCommissionPaid` 和 `AccumulatedRecharge` 字段
|
||||
- [x] 5.3 创建 `migrations/000116_remove_legacy_commission_fields.up.sql`(DROP COLUMN)
|
||||
- [x] 5.4 创建 `migrations/000116_remove_legacy_commission_fields.down.sql`(ADD COLUMN 回滚)
|
||||
- [x] 5.5 在测试环境执行迁移,通过 PostgreSQL MCP 确认字段已删除(字段不存在于 DB)
|
||||
- [x] 5.6 运行 `go build ./cmd/api ./cmd/worker` 确认编译通过
|
||||
|
||||
### Task 6: DTO _name 字段补全(分模块逐批)
|
||||
|
||||
- [x] 6.1 遍历 `internal/model/dto/` 统计所有 int 状态字段缺少 _name 字段的清单
|
||||
- [x] 6.2 **Account 模块**:补全 DTO _name 字段 + 常量映射函数 + Service 层赋值
|
||||
- [x] 6.3 **Asset 模块**:补全 DTO _name 字段 + 常量映射函数 + Service 层赋值
|
||||
- [x] 6.4 **Order 模块**:补全 DTO _name 字段 + 常量映射函数 + Service 层赋值
|
||||
- [x] 6.5 **Commission 模块**:补全 DTO _name 字段 + 常量映射函数 + Service 层赋值
|
||||
- [x] 6.6 **IotCard / Device 模块**:补全 DTO _name 字段 + 常量映射函数 + Service 层赋值
|
||||
- [x] 6.7 **剩余模块**(Recharge、Wallet、Package、Shop 等):批量补全
|
||||
- [x] 6.8 全量编译与静态分析(`go build + go vet`)
|
||||
- [x] 6.9 代码审查确认 _name 字段存在于 account/order/iot_card 等关键 DTO,Service 层赋值逻辑已实现(运行时验证需服务启动)
|
||||
|
||||
### Task 7: 未使用常量和错误码清理
|
||||
|
||||
- [x] 7.1 删除 `pkg/errors/codes.go` 中的 `CodeExceedLimit` 常量和对应错误消息映射
|
||||
- [x] 7.2 为 `pkg/constants/iot.go` 中约 22 个未引用的预留常量添加用途注释
|
||||
- [x] 7.3 运行 `go build` 和 `go vet` 确认清理无破坏
|
||||
|
||||
### Task 8: 删除空文件和注释代码
|
||||
|
||||
- [x] 8.1 删除 `internal/routes/recharge.go` 空文件
|
||||
- [x] 8.2 删除 `pkg/database/postgres.go` 中的 AutoMigrate 注释块(行 90-95)
|
||||
- [x] 8.3 保留 `internal/service/client_order/service.go` 中的实名认证检查注释,添加待确认标记
|
||||
|
||||
### Task 9: 全量编译验证
|
||||
|
||||
- [x] 9.1 运行 `go mod tidy` 确认依赖无变化
|
||||
- [x] 9.2 运行 `go build ./cmd/api` 和 `go build ./cmd/worker` 确认编译通过
|
||||
- [x] 9.3 运行 `go vet ./...` 进行静态分析
|
||||
- [x] 9.4 运行 `gofmt -l ./internal ./pkg` 检查代码格式(修复了2个预存文件)
|
||||
|
||||
### Task 0: 数据库迁移文件合并为生产基线(需 DB 环境)
|
||||
|
||||
- [x] 0.1 确认当前数据库 schema 完整可用(PostgreSQL MCP 验证 66 张表存在)
|
||||
- [x] 0.2 [跳过] pg_dump 不在当前环境,需在有 pg_dump 的机器手动执行:`pg_dump --schema-only --no-owner --no-acl -d junhong_cmp > migrations/000114_squash_baseline.up.sql`
|
||||
- [x] 0.3 [跳过] 依赖 0.2,完成 0.2 后手动编写 DROP TABLE 语句
|
||||
- [x] 0.4 创建 `migrations/000115_init_data.up.sql`(合并轮询配置初始数据 + purchase_role 回填)
|
||||
- [x] 0.5 创建 `migrations/000115_init_data.down.sql`(回滚初始数据)
|
||||
- [x] 0.6 归档旧迁移文件到 `migrations/archive/`(000000~000113 + backfill 脚本,共 228 个文件)
|
||||
- [x] 0.7 编写测试环境重置脚本 `scripts/reset_db.sh`
|
||||
- [ ] 0.8 [阻塞] 在全新数据库上验证 migrate up 完整链路(依赖 0.2)
|
||||
- [ ] 0.9 [阻塞] 重置测试环境数据库,切换到新基线(需团队协调)
|
||||
|
||||
---
|
||||
|
||||
## Final Verification Wave
|
||||
|
||||
- [x] F1 全量编译通过:`go build ./cmd/api ./cmd/worker` 无错误
|
||||
- [x] F2 静态分析通过:`go vet ./...` 无报告,`gofmt -l` 无格式问题(修复2个预存文件)
|
||||
- [x] F3 API 文档覆盖率 100%:`go run cmd/gendocs/main.go` 生成文档包含 190 个 API 路径
|
||||
- [x] F4 核心功能验证:代码审查通过(支付动态加载、轮询常量、_name字段已实现)
|
||||
31
AGENTS.md
31
AGENTS.md
@@ -17,7 +17,6 @@
|
||||
| 测试接口/验证数据 | `db-validation` | PostgreSQL MCP 使用方法和验证示例 |
|
||||
| 数据库迁移 | `db-migration` | 迁移命令、文件规范、执行流程、失败处理 |
|
||||
| 维护规范文档 | `doc-management` | 规范文档流程和维护规则 |
|
||||
| 调试 bug / 排查异常 | `systematic-debugging` | 四阶段根因分析流程、逐层诊断、场景速查表 |
|
||||
| 编写 Go 代码注释/文档注释 | `comment-standards` | 包/结构体/接口/函数/内联注释完整规范与示例 |
|
||||
| 创建涉及接口的 OpenSpec 提案 | `openspec-api-contract` | 探索阶段引导清单、提案必填章节与完成标准 |
|
||||
|
||||
@@ -113,6 +112,24 @@ Handler → Service → Store → Model
|
||||
- 禁止硬编码字符串和 magic numbers
|
||||
- **必须为所有常量添加中文注释**
|
||||
|
||||
### 枚举与状态字段(必须遵守)
|
||||
|
||||
**两个强制规则**:
|
||||
|
||||
1. **int vs string**:状态类(生命周期)用 `int`,类型/方式类用 `string`
|
||||
2. **DTO description 必须从 constants 原文抄写**,禁止凭记忆填写枚举值(历史上已有 description 与 constants 不一致导致前端显示错误的案例)
|
||||
|
||||
```go
|
||||
// ✅ description 从 constants 原文抄,格式统一用冒号+逗号
|
||||
Status int `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款)"`
|
||||
StatusName string `json:"status_name" description:"状态名称(中文)"` // Response DTO 必须加
|
||||
|
||||
// ❌ 禁止:启用/禁用用 1=启用 2=禁用(全局约定是 0=禁用, 1=启用)
|
||||
// ❌ 禁止:description 枚举值与 constants 不一致
|
||||
```
|
||||
|
||||
**完整规范**: 参见 [`docs/enum-status-standards.md`](docs/enum-status-standards.md)
|
||||
|
||||
### 注释规范
|
||||
|
||||
- **所有注释使用中文**,导出符号必须有文档注释(包、函数、类型、接口、常量)
|
||||
@@ -220,6 +237,13 @@ Handler → Service → Store → Model
|
||||
- [ ] 常量定义在 `pkg/constants/`
|
||||
- [ ] 使用 Go 惯用法(非 Java 风格)
|
||||
|
||||
### 枚举与状态
|
||||
|
||||
- [ ] 状态类字段用 `int`,类型/方式类字段用 `string`
|
||||
- [ ] 禁用/启用使用 `0=禁用, 1=启用`(禁止 `1=启用, 2=禁用`)
|
||||
- [ ] DTO description 枚举列表已从 `pkg/constants/` 原文抄写,无遗漏、无错误
|
||||
- [ ] Response DTO 的 int 状态字段有对应的 `_name` 文字字段
|
||||
|
||||
### 文档和注释
|
||||
|
||||
- [ ] 所有注释使用中文
|
||||
@@ -309,4 +333,7 @@ queueClient.EnqueueTask(ctx, constants.TaskTypeXxx, payloadBytes)
|
||||
> "我注意到任务 2.1 和 2.2 可以合并为一步完成,是否可以这样优化?"
|
||||
> "任务 3.1 在当前实现中可能不需要,是否可以跳过?"
|
||||
|
||||
**详细规范和 OpenSpec 工作流请查看**: `@/openspec/AGENTS.md`
|
||||
---
|
||||
|
||||
|
||||
**详细规范和 OpenSpec 工作流请查看**: `@/openspec/AGENTS.md`
|
||||
|
||||
522
AI系统级规划提示词规范.md
Normal file
522
AI系统级规划提示词规范.md
Normal file
@@ -0,0 +1,522 @@
|
||||
# AI 系统级规划提示词规范
|
||||
|
||||
用途:在需要 AI 生成大功能、复杂系统或跨模块改造计划时,先粘贴本文的提示词,再补充业务背景。它的目标是让 AI 先收敛目标、边界、事实源、状态机、失败路径和验收标准,再生成不容易漂移的系统级 plan。
|
||||
|
||||
建议使用方式:
|
||||
|
||||
1. 先把下面完整提示词复制给 AI。
|
||||
2. 再贴业务背景、已有代码约束、用户旅程或参考材料。
|
||||
3. 第一轮只让 AI 提澄清问题和共识摘要,不要直接进入最终 plan。
|
||||
4. 共识确认后,再要求 AI 生成完整系统级 plan。
|
||||
5. 最后要求 AI 进行反向审查,并把缺口合并回最终版。
|
||||
|
||||
## 完整提示词
|
||||
|
||||
````text
|
||||
你现在不是代码执行者,而是“资深系统架构师 + 产品技术负责人 + 交付负责人”。
|
||||
|
||||
请帮我为一个功能/项目生成系统级实现计划。你的目标不是简单列任务,而是产出一份能约束后续 AI 执行、不容易漂移、能覆盖业务闭环的完整 plan。
|
||||
|
||||
在我明确说“开始实现”之前,不要写代码,不要改文件,不要进入实现。
|
||||
|
||||
# 一、工作方式
|
||||
|
||||
你必须按以下顺序工作:
|
||||
|
||||
1. 先理解我提供的背景。
|
||||
2. 如果信息不足,不要直接生成最终 plan,先提出“关键澄清问题”。
|
||||
3. 澄清问题必须按优先级排序,最多分三组:
|
||||
- 必须确认,否则 plan 会错
|
||||
- 建议确认,否则执行中可能漂移
|
||||
- 可以暂时由 AI 假设
|
||||
4. 当信息足够后,先输出“共识摘要”,让我确认。
|
||||
5. 共识确认后,再生成完整系统级 plan。
|
||||
6. 生成 plan 后,必须进行一次“反向审查”,找缺口、矛盾、漂移风险。
|
||||
7. 最后把审查发现合并进最终版 plan。
|
||||
|
||||
# 二、计划的核心原则
|
||||
|
||||
生成计划时必须遵守:
|
||||
|
||||
- 不要只按 Model / Store / Service / Handler 拆任务。
|
||||
- 必须按“业务闭环”组织阶段。
|
||||
- 每个阶段都要回答:这个阶段让哪个用户、哪个业务流程真正可用?
|
||||
- 所有计划必须明确:
|
||||
- 做什么
|
||||
- 不做什么
|
||||
- 为什么现在做
|
||||
- 为什么不是以后做
|
||||
- 依赖什么
|
||||
- 如何验证完成
|
||||
- 对不确定的内容必须显式标记为“假设”或“待确认”,不能悄悄编造。
|
||||
- 不允许 scope creep。任何超出 MVP 的想法必须放到 V2 / 后置增强。
|
||||
- 必须区分:
|
||||
- 事实源
|
||||
- 缓存
|
||||
- 派生数据
|
||||
- 日志/对象存储/审计材料
|
||||
- 涉及资金、权限、状态流转、异步任务、外部接口时,必须单独成节。
|
||||
|
||||
# 三、计划必须包含的章节
|
||||
|
||||
最终 plan 必须包含以下章节,不得省略。
|
||||
|
||||
## 0. 目标与边界
|
||||
|
||||
说明:
|
||||
|
||||
- 项目/功能目标
|
||||
- 当前版本 MVP 范围
|
||||
- 明确不做什么
|
||||
- V2 / 后置增强
|
||||
- 关键原则
|
||||
- 核心业务闭环
|
||||
|
||||
必须写成清晰约束,例如:
|
||||
|
||||
- “A 是事实源,B 只是缓存”
|
||||
- “系统不保存 XXX 明文”
|
||||
- “本阶段不做 XXX”
|
||||
- “失败时必须 XXX”
|
||||
- “用户可见结果必须 XXX”
|
||||
|
||||
## 1. 角色与用户旅程
|
||||
|
||||
列出所有角色,例如:
|
||||
|
||||
- 普通用户
|
||||
- 运营人员
|
||||
- 管理员
|
||||
- 第三方系统
|
||||
- 异步 worker
|
||||
- 外部服务
|
||||
|
||||
每个角色都要有完整旅程:
|
||||
|
||||
```text
|
||||
角色
|
||||
-> 入口
|
||||
-> 操作
|
||||
-> 系统处理
|
||||
-> 状态变化
|
||||
-> 用户看到的结果
|
||||
-> 异常时如何处理
|
||||
```
|
||||
|
||||
如果某个角色没有闭环,要指出缺口。
|
||||
|
||||
## 2. 系统边界与模块职责
|
||||
|
||||
说明每个模块负责什么、不负责什么。
|
||||
|
||||
必须包含:
|
||||
|
||||
- 前端职责
|
||||
- Handler/API 职责
|
||||
- Service 职责
|
||||
- Store/DB 职责
|
||||
- Worker/异步任务职责
|
||||
- 外部服务职责
|
||||
- Admin/运营后台职责
|
||||
|
||||
禁止把业务逻辑模糊地写成“后端处理”。
|
||||
|
||||
## 3. 当前代码与现状依据
|
||||
|
||||
如果你能访问代码库,必须先阅读相关文件,再写本节。
|
||||
|
||||
本节要列出:
|
||||
|
||||
- 已有能力
|
||||
- 已有表/模型
|
||||
- 已有 API
|
||||
- 已有服务/Store/Worker
|
||||
- 可以复用的实现
|
||||
- 已知坑点
|
||||
- 与现有规范冲突的地方
|
||||
|
||||
每条重要判断都要带文件路径或明确依据。
|
||||
|
||||
如果不能访问代码库,必须说明“以下为基于用户描述的假设”。
|
||||
|
||||
## 4. 数据模型与事实源
|
||||
|
||||
必须写清楚:
|
||||
|
||||
- 新增表
|
||||
- 修改表
|
||||
- 字段含义
|
||||
- 枚举值
|
||||
- 唯一约束
|
||||
- 索引
|
||||
- 软删除策略
|
||||
- 迁移策略
|
||||
- 回滚策略
|
||||
- 历史数据兼容
|
||||
- 哪些数据是事实源
|
||||
- 哪些数据只是缓存/快照/投影
|
||||
|
||||
涉及金额时必须写:
|
||||
|
||||
- 金额单位
|
||||
- 精度策略
|
||||
- 是否允许负数
|
||||
- 四舍五入/截断规则
|
||||
- 资金流水是否可追溯
|
||||
- 是否允许直接改余额缓存
|
||||
|
||||
## 5. API 契约
|
||||
|
||||
列出所有接口:
|
||||
|
||||
```text
|
||||
METHOD /path
|
||||
权限:
|
||||
入参:
|
||||
出参:
|
||||
错误码:
|
||||
状态变化:
|
||||
幂等规则:
|
||||
审计/日志:
|
||||
```
|
||||
|
||||
必须包含:
|
||||
|
||||
- 用户侧 API
|
||||
- Admin API
|
||||
- Webhook/API callback
|
||||
- Worker 触发入口
|
||||
- 内部接口或复用点
|
||||
|
||||
新增 Handler 时必须说明文档生成器/路由注册同步要求。
|
||||
|
||||
## 6. 状态机
|
||||
|
||||
凡是有状态字段,必须写状态机。
|
||||
|
||||
格式:
|
||||
|
||||
```text
|
||||
状态:
|
||||
- pending
|
||||
- processing
|
||||
- success
|
||||
- failed
|
||||
- cancelled
|
||||
|
||||
允许流转:
|
||||
pending -> processing
|
||||
processing -> success
|
||||
processing -> failed
|
||||
|
||||
禁止流转:
|
||||
success -> pending
|
||||
failed -> processing
|
||||
|
||||
并发规则:
|
||||
- 同一资源同时只能有一个 pending
|
||||
- 状态更新必须使用 WHERE status = expected
|
||||
```
|
||||
|
||||
必须覆盖:
|
||||
|
||||
- 正常路径
|
||||
- 失败路径
|
||||
- 取消路径
|
||||
- 重试路径
|
||||
- 人工处理路径
|
||||
- 状态不可逆规则
|
||||
|
||||
## 7. 权限与越权防护
|
||||
|
||||
必须说明:
|
||||
|
||||
- 谁能访问
|
||||
- 如何识别身份
|
||||
- 如何判断资源归属
|
||||
- Handler 层做什么
|
||||
- Service 层做什么
|
||||
- Store 层是否需要过滤
|
||||
- Admin 是否有二次校验
|
||||
- 错误信息是否防止泄露资源存在性
|
||||
|
||||
要求:
|
||||
|
||||
- 不得信任前端传入的用户身份、角色、权限字段。
|
||||
- 无权限和资源不存在是否统一返回,需要明确。
|
||||
- 所有敏感操作必须有审计。
|
||||
|
||||
## 8. 幂等、并发与事务
|
||||
|
||||
必须单独说明:
|
||||
|
||||
- 创建类操作如何防重复
|
||||
- 状态流转如何防重复
|
||||
- 金额/库存/余额如何防并发错误
|
||||
- 异步任务是否可重复消费
|
||||
- Webhook 是否幂等
|
||||
- 请求重试会发生什么
|
||||
- 事务边界在哪里
|
||||
- 事务内禁止做什么
|
||||
- 事务提交后才做什么
|
||||
|
||||
必须写出关键策略,例如:
|
||||
|
||||
```text
|
||||
状态流转使用 WHERE id = ? AND status = ?
|
||||
余额变更必须在同一事务内完成
|
||||
异步任务在事务提交后入队
|
||||
Webhook event_id 必须幂等
|
||||
```
|
||||
|
||||
## 9. 异步任务与外部服务
|
||||
|
||||
如果涉及外部服务或 Worker,必须写:
|
||||
|
||||
- 任务类型
|
||||
- payload 结构
|
||||
- 入队时机
|
||||
- 消费逻辑
|
||||
- 重试策略
|
||||
- 幂等键
|
||||
- 失败后状态
|
||||
- 日志关键字
|
||||
- 外部服务超时策略
|
||||
- 外部服务返回未知状态时如何处理
|
||||
|
||||
禁止只写“调用第三方接口”。
|
||||
|
||||
## 10. 失败路径与异常处理矩阵
|
||||
|
||||
必须提供失败矩阵:
|
||||
|
||||
| 场景 | 系统行为 | 状态变化 | 是否重试 | 用户可见结果 | Admin 如何处理 |
|
||||
|---|---|---|---|---|---|
|
||||
|
||||
至少覆盖:
|
||||
|
||||
- 参数错误
|
||||
- 无权限
|
||||
- 资源不存在
|
||||
- 并发冲突
|
||||
- 重复请求
|
||||
- 外部接口失败
|
||||
- 外部接口超时
|
||||
- 结果未知
|
||||
- 事务失败
|
||||
- 异步任务失败
|
||||
- 数据不一致
|
||||
- 人工介入
|
||||
|
||||
## 11. Admin / 运营闭环
|
||||
|
||||
必须回答:
|
||||
|
||||
- Admin 在哪里看到这件事?
|
||||
- Admin 能筛选什么?
|
||||
- Admin 能处理什么?
|
||||
- Admin 处理后状态如何变化?
|
||||
- 是否需要备注、原因、凭证?
|
||||
- 是否写审计日志?
|
||||
- 用户能否看到处理结果?
|
||||
|
||||
如果没有 Admin 入口,必须说明为什么不需要。
|
||||
|
||||
## 12. 日志、审计与可观测性
|
||||
|
||||
必须列出:
|
||||
|
||||
- 关键日志
|
||||
- 审计事件
|
||||
- 操作人
|
||||
- request_id / trace_id
|
||||
- 重要状态变化
|
||||
- 外部请求/响应是否保存
|
||||
- 敏感字段如何脱敏
|
||||
- 排查问题时查哪些表、哪些日志
|
||||
|
||||
## 13. 前端 / 页面 / 交互契约
|
||||
|
||||
如果涉及前端,必须说明:
|
||||
|
||||
- 页面入口
|
||||
- Tab / 弹窗 / 表单
|
||||
- 空态
|
||||
- 加载态
|
||||
- 错误态
|
||||
- 提交前确认
|
||||
- 成功后刷新哪些数据
|
||||
- 权限不足时如何展示
|
||||
- 移动端是否需要特殊处理
|
||||
|
||||
不要只写“新增页面”。
|
||||
|
||||
## 14. 分阶段实现计划
|
||||
|
||||
阶段必须按业务闭环拆,不要只按技术层拆。
|
||||
|
||||
每个 Phase 必须包含:
|
||||
|
||||
```text
|
||||
Phase N - 名称
|
||||
|
||||
目标:
|
||||
本阶段完成后,哪个业务闭环可用:
|
||||
|
||||
包含需求:
|
||||
不包含:
|
||||
依赖:
|
||||
涉及模块:
|
||||
关键表:
|
||||
关键接口:
|
||||
关键状态机:
|
||||
关键风险:
|
||||
验证方式:
|
||||
完成标准:
|
||||
```
|
||||
|
||||
阶段顺序必须解释为什么这样排。
|
||||
|
||||
如果有破坏性变更,必须单独阶段、单独部署、单独回滚。
|
||||
|
||||
## 15. 任务拆分
|
||||
|
||||
在系统级 plan 完成后,再拆 tasks。
|
||||
|
||||
每个 task 必须包含:
|
||||
|
||||
- 任务目标
|
||||
- 修改文件范围
|
||||
- 输入依赖
|
||||
- 输出产物
|
||||
- 验证方式
|
||||
- 不允许做什么
|
||||
- 完成标准
|
||||
|
||||
不要把多个无关业务目标塞进同一个 task。
|
||||
|
||||
## 16. 验收标准
|
||||
|
||||
验收必须是可观察、可执行、可判定的。
|
||||
|
||||
格式:
|
||||
|
||||
```text
|
||||
1. 当用户执行 XXX 时,系统应 XXX
|
||||
2. DB 中应出现 XXX
|
||||
3. 日志中应出现 XXX
|
||||
4. Admin 页面应能看到 XXX
|
||||
5. 重复提交时不会 XXX
|
||||
6. 外部服务失败时状态为 XXX
|
||||
```
|
||||
|
||||
验收必须覆盖:
|
||||
|
||||
- 用户主链路
|
||||
- Admin 处理链路
|
||||
- 权限拒绝
|
||||
- 幂等重复
|
||||
- 并发边界
|
||||
- 外部失败
|
||||
- 数据一致性
|
||||
- 文档/路由注册
|
||||
|
||||
如果项目不写自动化测试,则验收方式使用:
|
||||
|
||||
- `go build`
|
||||
- `rg` / 静态搜索
|
||||
- 数据库查询
|
||||
- curl / Postman 手工接口验证
|
||||
- Worker/API 日志
|
||||
- OpenAPI 文档生成检查
|
||||
|
||||
不要生成 `*_test.go`,除非我明确要求。
|
||||
|
||||
## 17. 风险与后置增强
|
||||
|
||||
必须分成:
|
||||
|
||||
- 当前必须解决的风险
|
||||
- 可以接受但要记录的风险
|
||||
- V2 后置增强
|
||||
- 不再讨论的 rejected 方案
|
||||
|
||||
每个 rejected 方案都要写拒绝原因,防止后续 AI 反复重新考虑。
|
||||
|
||||
## 18. 反向审查
|
||||
|
||||
生成初稿后,必须审查以下问题:
|
||||
|
||||
1. 是否有用户旅程断点?
|
||||
2. 是否有数据事实源不清?
|
||||
3. 是否有状态机缺口?
|
||||
4. 是否有权限/越权风险?
|
||||
5. 是否有幂等和并发风险?
|
||||
6. 是否有外部服务失败路径?
|
||||
7. 是否有 Admin/运营处理缺口?
|
||||
8. 是否有资金/余额/库存类一致性风险?
|
||||
9. 是否有接口文档/路由注册遗漏?
|
||||
10. 是否有验收标准不可执行?
|
||||
11. 是否有和项目规范冲突?
|
||||
12. 是否有 scope creep?
|
||||
13. 是否有“写入完成但读取侧没规划”的问题?
|
||||
14. 是否有“后端完成但前端/运营入口缺失”的问题?
|
||||
|
||||
审查后输出:
|
||||
|
||||
```text
|
||||
发现的问题:
|
||||
影响:
|
||||
修正方式:
|
||||
是否已合并进最终 plan:
|
||||
```
|
||||
|
||||
# 四、输出要求
|
||||
|
||||
输出必须使用中文。
|
||||
|
||||
最终输出结构:
|
||||
|
||||
1. 关键澄清问题(如需要)
|
||||
2. 共识摘要
|
||||
3. 完整系统级 plan
|
||||
4. 分阶段计划
|
||||
5. 任务拆分
|
||||
6. MVP 验收清单
|
||||
7. 风险与后置增强
|
||||
8. 反向审查结果
|
||||
|
||||
不要空泛,不要只写原则。必须具体到业务状态、接口、数据、失败路径和验收证据。
|
||||
|
||||
# 五、我的项目特殊规范
|
||||
|
||||
以下规范必须遵守:
|
||||
|
||||
- 使用中文交互、中文文档、中文注释、中文日志、中文用户错误消息。
|
||||
- 代码命名使用英文。
|
||||
- 严格遵守项目现有技术栈,不主动引入新框架或新依赖。
|
||||
- 遵守 Handler → Service → Store → Model 分层。
|
||||
- Handler 不写业务逻辑。
|
||||
- Service 承载业务规则。
|
||||
- Store 负责数据访问和事务。
|
||||
- 所有错误使用项目统一错误码。
|
||||
- 新增 Handler 必须同步路由注册和文档生成器。
|
||||
- 状态类字段用 int,类型/方式类字段用 string。
|
||||
- 所有枚举描述必须与 constants 保持一致。
|
||||
- 数据库不使用外键约束,不使用 GORM 关联标签。
|
||||
- 默认不写自动化测试,除非我明确要求。
|
||||
- 验证默认使用:go build、静态搜索、数据库查询、curl/Postman、日志、OpenAPI 文档生成检查。
|
||||
|
||||
# 六、现在请先做第一步
|
||||
|
||||
我接下来会提供功能背景。
|
||||
|
||||
你收到背景后,先不要生成最终 plan。
|
||||
请先输出:
|
||||
|
||||
1. 你理解的目标
|
||||
2. 你理解的非目标
|
||||
3. 你认为必须确认的问题
|
||||
4. 你建议我补充的上下文
|
||||
5. 哪些地方可以先用假设推进
|
||||
````
|
||||
46
CLAUDE.md
46
CLAUDE.md
@@ -17,7 +17,6 @@
|
||||
| 测试接口/验证数据 | `db-validation` | PostgreSQL MCP 使用方法和验证示例 |
|
||||
| 数据库迁移 | `db-migration` | 迁移命令、文件规范、执行流程、失败处理 |
|
||||
| 维护规范文档 | `doc-management` | 规范文档流程和维护规则 |
|
||||
| 调试 bug / 排查异常 | `systematic-debugging` | 四阶段根因分析流程、逐层诊断、场景速查表 |
|
||||
| 编写 Go 代码注释/文档注释 | `comment-standards` | 包/结构体/接口/函数/内联注释完整规范与示例 |
|
||||
| 创建涉及接口的 OpenSpec 提案 | `openspec-api-contract` | 探索阶段引导清单、提案必填章节与完成标准 |
|
||||
|
||||
@@ -113,6 +112,24 @@ Handler → Service → Store → Model
|
||||
- 禁止硬编码字符串和 magic numbers
|
||||
- **必须为所有常量添加中文注释**
|
||||
|
||||
### 枚举与状态字段(必须遵守)
|
||||
|
||||
**两个强制规则**:
|
||||
|
||||
1. **int vs string**:状态类(生命周期)用 `int`,类型/方式类用 `string`
|
||||
2. **DTO description 必须从 constants 原文抄写**,禁止凭记忆填写枚举值(历史上已有 description 与 constants 不一致导致前端显示错误的案例)
|
||||
|
||||
```go
|
||||
// ✅ description 从 constants 原文抄,格式统一用冒号+逗号
|
||||
Status int `json:"status" description:"状态 (1:待支付, 2:已支付, 3:已完成, 4:已关闭, 5:已退款)"`
|
||||
StatusName string `json:"status_name" description:"状态名称(中文)"` // Response DTO 必须加
|
||||
|
||||
// ❌ 禁止:启用/禁用用 1=启用 2=禁用(全局约定是 0=禁用, 1=启用)
|
||||
// ❌ 禁止:description 枚举值与 constants 不一致
|
||||
```
|
||||
|
||||
**完整规范**: 参见 [`docs/enum-status-standards.md`](docs/enum-status-standards.md)
|
||||
|
||||
### 注释规范
|
||||
|
||||
- **所有注释使用中文**,导出符号必须有文档注释(包、函数、类型、接口、常量)
|
||||
@@ -220,6 +237,13 @@ Handler → Service → Store → Model
|
||||
- [ ] 常量定义在 `pkg/constants/`
|
||||
- [ ] 使用 Go 惯用法(非 Java 风格)
|
||||
|
||||
### 枚举与状态
|
||||
|
||||
- [ ] 状态类字段用 `int`,类型/方式类字段用 `string`
|
||||
- [ ] 禁用/启用使用 `0=禁用, 1=启用`(禁止 `1=启用, 2=禁用`)
|
||||
- [ ] DTO description 枚举列表已从 `pkg/constants/` 原文抄写,无遗漏、无错误
|
||||
- [ ] Response DTO 的 int 状态字段有对应的 `_name` 文字字段
|
||||
|
||||
### 文档和注释
|
||||
|
||||
- [ ] 所有注释使用中文
|
||||
@@ -309,4 +333,22 @@ queueClient.EnqueueTask(ctx, constants.TaskTypeXxx, payloadBytes)
|
||||
> "我注意到任务 2.1 和 2.2 可以合并为一步完成,是否可以这样优化?"
|
||||
> "任务 3.1 在当前实现中可能不需要,是否可以跳过?"
|
||||
|
||||
**详细规范和 OpenSpec 工作流请查看**: `@/openspec/AGENTS.md`
|
||||
---
|
||||
|
||||
|
||||
|
||||
**详细规范和 OpenSpec 工作流请查看**: `@/openspec/AGENTS.md`
|
||||
|
||||
## Agent skills
|
||||
|
||||
### Issue tracker
|
||||
|
||||
Issue 和 PRD 以本地 Markdown 文件形式存放在 `.scratch/<feature-slug>/` 下。详见 `docs/agents/issue-tracker.md`。
|
||||
|
||||
### Triage labels
|
||||
|
||||
使用默认的英文 Triage 标签词汇(`needs-triage` / `needs-info` / `ready-for-agent` / `ready-for-human` / `wontfix`)。详见 `docs/agents/triage-labels.md`。
|
||||
|
||||
### Domain docs
|
||||
|
||||
单 Context 布局——根目录的 `CONTEXT.md` + `docs/adr/`(按需懒创建),与现有的 `openspec/` 提案工作流并存。详见 `docs/agents/domain.md`。
|
||||
|
||||
19
CONTEXT.md
Normal file
19
CONTEXT.md
Normal file
@@ -0,0 +1,19 @@
|
||||
# 领域术语表
|
||||
|
||||
## 资产(Asset)
|
||||
|
||||
**IoT 卡 / IotCard**:物联网流量卡,以 ICCID 为唯一标识。分为独立卡(`is_standalone=true`,未绑定设备)和设备卡(绑定在设备上)。
|
||||
|
||||
**设备 / Device**:硬件设备,以虚拟号(VirtualNo)为业务标识,可插卡使用。
|
||||
|
||||
**资产世代 / Generation**:`generation` 字段记录卡/设备经历"换货+旧资产转新"操作的次数。初始值为 1;每完成一次换货且旧资产执行"转新"后加 1。`generation > 1` 说明该资产曾作为旧资产经历过换货并被重新投入使用。
|
||||
|
||||
**资产业务状态 / AssetStatus**:`asset_status` 字段表示资产在 CMP 内部的业务生命周期(1=在库, 2=已销售, 3=已换货, 4=已停用)。换货完成时旧资产置为 3;执行"旧资产转新"后重置为 1,同时 generation+1。
|
||||
|
||||
## 企业授权(Enterprise Authorization)
|
||||
|
||||
**卡企业授权**:将独立卡授权给企业使用的操作。**业务约束:一张卡在同一时间只能授权给一个企业**(与设备授权保持一致,数据库通过部分唯一索引强制约束)。
|
||||
|
||||
**有效授权**:`revoked_at IS NULL AND deleted_at IS NULL` 的授权记录。撤回授权后(`revoked_at` 有值)视为历史记录,不计入当前授权关系。
|
||||
|
||||
**设备企业授权**:将设备(含其绑定卡)授权给企业使用的操作。同一台设备同一时间只能授权给一个企业(`uq_active_device_auth` 唯一约束)。
|
||||
63
README.md
63
README.md
@@ -16,6 +16,16 @@
|
||||
|
||||
君鸿卡管系统是一个物联网卡和号卡的全生命周期管理平台,支持三种客户类型和两种组织实体的多租户管理。
|
||||
|
||||
### 后台运营批量能力
|
||||
|
||||
后台卡/设备套餐系列绑定接口支持按显式列表、号段范围、筛选条件三种方式批量选择资源。运营人员可按完整筛选结果批量设置或清除套餐系列绑定,不受列表分页勾选限制。
|
||||
|
||||
### 设备状态口径
|
||||
|
||||
设备 `status` 仅表示归属状态(在库/已分销),业务激活状态通过 `activation_status` 返回;设备需同时具备生效中主套餐和任意已实名绑定卡才视为已激活。
|
||||
|
||||
后台设备列表 `GET /api/admin/devices` 支持按 `virtual_no`、`imei`、设备名称、归属状态、激活状态、店铺、套餐系列等条件筛选。
|
||||
|
||||
### 三种客户类型
|
||||
|
||||
| 客户类型 | 业务特点 | 典型场景 | 钱包归属 |
|
||||
@@ -210,20 +220,39 @@ default:
|
||||
- **统一错误处理**:全局 ErrorHandler 统一处理所有 API 错误,返回一致的 JSON 格式(包含错误码、消息、时间戳);Panic 自动恢复防止服务崩溃;错误分类处理(客户端 4xx、服务端 5xx)和日志级别控制;敏感信息自动脱敏保护
|
||||
- **数据持久化**:GORM + PostgreSQL 集成,提供完整的 CRUD 操作、事务支持和数据库迁移能力
|
||||
- **异步任务处理**:Asynq 任务队列集成,支持任务提交、后台执行、自动重试和幂等性保障,实现邮件发送、数据同步等异步任务
|
||||
- **统一导出任务系统**:新增全局导出任务入口(`/api/admin/export-tasks`),支持 `scene=device/iot_card`、`format=xlsx/csv`、异步分片执行、任务取消、详情直出 24 小时下载链接;详见 [功能总结](docs/unified-export-task-system/功能总结.md) 与 [验收记录](docs/unified-export-task-system/验收记录.md)
|
||||
- **资产操作审计日志**:新增 `tb_asset_operation_log`,统一覆盖卡/设备敏感写操作与统一资产入口,记录 `success/failed/denied`、前后镜像、请求上下文、批量统计并支持敏感字段脱敏;详见 [功能总结](docs/add-asset-operation-audit-log/功能总结.md)、[接口回放示例](docs/add-asset-operation-audit-log/接口回放示例.md) 与 [SQL 验收脚本](docs/add-asset-operation-audit-log/手工验收脚本.sql)
|
||||
- **RBAC 权限系统**:完整的基于角色的访问控制,支持账号、角色、权限的多对多关联和层级关系;基于店铺层级的自动数据权限过滤,实现多租户数据隔离;使用 PostgreSQL WITH RECURSIVE 查询下级店铺并通过 Redis 缓存优化性能;完整的权限检查功能支持路由级别的细粒度权限控制,支持平台过滤(web/h5/all)和超级管理员自动跳过(详见 [功能总结](docs/004-rbac-data-permission/功能总结.md)、[使用指南](docs/004-rbac-data-permission/使用指南.md) 和 [权限检查使用指南](docs/permission-check-usage.md))
|
||||
- **商户管理**:完整的商户(Shop)和商户账号管理功能,支持商户创建时自动创建初始坐席账号、删除商户时批量禁用关联账号、账号密码重置等功能(详见 [使用指南](docs/shop-management/使用指南.md) 和 [API 文档](docs/shop-management/API文档.md))
|
||||
- **B 端认证系统**:完整的后台和 H5 认证功能,支持基于 Redis 的 Token 管理和双令牌机制(Access Token 24h + Refresh Token 7天);包含登录、登出、Token 刷新、用户信息查询和密码修改功能;通过用户类型隔离确保后台(SuperAdmin、Platform、Agent)和 H5(Agent、Enterprise)的访问控制;**登录响应包含菜单树和按钮权限**(menus/buttons),前端无需二次处理直接渲染侧边栏和控制按钮显示;详见 [API 文档](docs/api/auth.md)、[使用指南](docs/auth-usage-guide.md)、[架构说明](docs/auth-architecture.md) 和 [菜单权限使用指南](docs/login-menu-button-response/使用指南.md)
|
||||
- **B 端认证系统**:完整的后台和 H5 认证功能,支持基于 Redis 的 Token 管理和双令牌机制(Access Token 24h + Refresh Token 7天);包含登录、登出、Token 刷新、用户信息查询和密码修改功能;通过用户类型隔离确保后台(SuperAdmin、Platform、Agent)和 H5(Agent、Enterprise)的访问控制;详见 [API 文档](docs/api/auth.md)、[使用指南](docs/auth-usage-guide.md) 和 [架构说明](docs/auth-architecture.md)
|
||||
- **生命周期管理**:物联网卡/号卡的开卡、激活、停机、复机、销户
|
||||
- **代理商体系**:层级管理和分佣结算,支持差价佣金和一次性佣金两种佣金类型,详见 [套餐与佣金业务模型](docs/commission-package-model.md)
|
||||
- **代理开放接口**:新增 `/api/open/v1` 签名接口,代理店铺第三方系统可调用卡流量、卡状态、实名状态、套餐列表、预充值钱包余额/流水和钱包套餐购买能力。详见 [对接说明](docs/agent-open-api/功能总结.md) 与 [误发差价佣金修复说明](docs/agent-open-api/开放接口误发差价佣金修复说明.md)
|
||||
- **批量同步**:卡状态、实名状态、流量使用情况
|
||||
- **轮询系统**:IoT 卡实名状态、流量使用、套餐余额的定时轮询检查;支持配置化轮询策略、动态并发控制、告警系统、数据清理和手动触发功能;详见 [轮询系统文档](docs/polling-system/README.md)
|
||||
- **套餐系统升级**:完整的套餐生命周期管理,支持主套餐排队激活、加油包绑定主套餐、囤货待实名激活、流量按优先级扣减、自然月/按天有效期计算、日/月/年流量重置、客户端流量查询和套餐流量详单;详见 [套餐系统升级文档](docs/package-system-upgrade/)
|
||||
- **套餐价格回退与平台赠送策略**:新增价格配置状态、普通套餐成本价回退、赠送套餐独立语义、平台后台赠送订单发放和历史 0 价复核清单;详见 [功能总结](docs/package-price-fallback-and-platform-gift-policy/功能总结.md) 与 [最终验收清单](docs/package-price-fallback-and-platform-gift-policy/最终验收清单.md)
|
||||
- **分佣验证指引**:对代理分佣的冻结、解冻、提现校验流程进行了结构化说明与流程图,详见 [分佣逻辑正确与否验证](docs/优化说明/分佣逻辑正确与否验证.md)
|
||||
- **对象存储**:S3 兼容的对象存储服务集成(联通云 OSS),支持预签名 URL 上传、文件下载、临时文件处理;用于 ICCID 批量导入、数据导出等场景;详见 [使用指南](docs/object-storage/使用指南.md) 和 [前端接入指南](docs/object-storage/前端接入指南.md)
|
||||
- **微信集成**:完整的微信公众号 OAuth 认证和微信支付功能(JSAPI + H5),使用 PowerWeChat v3 SDK;支持个人客户微信授权登录、账号绑定、微信内支付和浏览器 H5 支付;支付回调自动验证签名和幂等性处理;详见 [使用指南](docs/wechat-integration/使用指南.md) 和 [API 文档](docs/wechat-integration/API文档.md)
|
||||
- **C 端微信 AppID 获取接口**:新增免登录接口 `GET /api/c/v1/wechat/appid`,仅返回当前生效微信配置中的公众号 `app_id`,供前端在拉起微信授权或初始化微信能力前动态获取;详见 [功能总结](docs/client-wechat-appid/功能总结.md)
|
||||
- **订单超时自动取消**:待支付订单(微信/支付宝)30 分钟超时自动取消,支持钱包余额解冻;使用 Asynq Scheduler 每分钟扫描,取代原有 time.Ticker 实现;同时将告警检查和数据清理迁移至 Asynq Scheduler 统一调度;详见 [功能总结](docs/order-expiration/功能总结.md)
|
||||
|
||||
### 导出任务接口示例
|
||||
|
||||
```bash
|
||||
# 创建导出任务(scene 支持 device / iot_card)
|
||||
curl -X POST '/api/admin/export-tasks' \\
|
||||
-H 'Content-Type: application/json' \\
|
||||
-H 'Authorization: Bearer <token>' \\
|
||||
-d '{\"scene\":\"device\",\"format\":\"xlsx\"}'
|
||||
|
||||
# 查询导出任务列表(支持 scene/status/time 过滤)
|
||||
curl '/api/admin/export-tasks?page=1&page_size=20&scene=device' \\
|
||||
-H 'Authorization: Bearer <token>'
|
||||
```
|
||||
|
||||
## 用户体系设计
|
||||
|
||||
系统支持四种用户类型和两种组织实体,实现分层级的多租户管理:
|
||||
@@ -471,17 +500,22 @@ junhong_cmp_fiber/
|
||||
└────────────┬────────────┘
|
||||
│
|
||||
┌────────────▼────────────┐
|
||||
│ 4. 认证中间件 │
|
||||
│ 4. CORS 中间件 │
|
||||
│ (跨域预检) │
|
||||
└────────────┬────────────┘
|
||||
│
|
||||
┌────────────▼────────────┐
|
||||
│ 5. 认证中间件 │
|
||||
│ (按路由组配置) │ ─── 模块化路由注册
|
||||
└────────────┬────────────┘
|
||||
│
|
||||
┌────────────▼────────────┐
|
||||
│ 5. RateLimiter 中间件 │
|
||||
│ 6. RateLimiter 中间件 │
|
||||
│ (限流) │ ─── 可选 (config: enable_rate_limiter)
|
||||
└────────────┬────────────┘
|
||||
│
|
||||
┌────────────▼────────────┐
|
||||
│ 6. 路由处理器 │
|
||||
│ 7. 路由处理器 │
|
||||
│ (业务逻辑) │
|
||||
└────────────┬────────────┘
|
||||
│
|
||||
@@ -520,12 +554,22 @@ junhong_cmp_fiber/
|
||||
- **始终激活**:是
|
||||
- **日志格式**:包含字段的 JSON:timestamp、level、method、path、status、duration_ms、request_id、ip、user_agent、user_id
|
||||
|
||||
#### 4. 认证中间件(pkg/middleware/auth.go 和 internal/middleware/)
|
||||
#### 4. CORS 中间件(Fiber cors)
|
||||
- **用途**:允许已配置前端域名跨域访问 API
|
||||
- **行为**:
|
||||
- 对浏览器预检 `OPTIONS` 请求返回 204
|
||||
- 添加 `Access-Control-Allow-Origin`、`Access-Control-Allow-Methods`、`Access-Control-Allow-Headers`
|
||||
- 必须在业务路由和认证中间件之前注册,避免预检请求被 401 拦截
|
||||
- **配置**:`middleware.cors.*`(默认启用)
|
||||
- **默认来源**:`*`(全部来源)。使用通配来源时 `allow_credentials` 必须为 `false`
|
||||
|
||||
#### 5. 认证中间件(pkg/middleware/auth.go 和 internal/middleware/)
|
||||
- **用途**:使用 Token 验证对请求进行认证
|
||||
- **行为**:
|
||||
- 从 `Authorization: Bearer {token}` 请求头提取 token
|
||||
- 通过 TokenValidator 函数验证 token(支持 JWT 和 Redis Token)
|
||||
- 如果缺失/无效 token 返回 401
|
||||
- `OPTIONS` 预检请求直接返回 204,不做 Token 校验
|
||||
- 成功时将用户信息存储在上下文中(UserID、UserType、ShopID、EnterpriseID)
|
||||
- **实现方式**:模块化路由注册(无全局配置)
|
||||
- `/api/admin/*`:后台认证(SuperAdmin、Platform、Agent)
|
||||
@@ -537,7 +581,7 @@ junhong_cmp_fiber/
|
||||
- 1002:无效或过期 token
|
||||
- 1003:权限不足
|
||||
|
||||
#### 5. RateLimiter 中间件(internal/middleware/ratelimit.go)
|
||||
#### 6. RateLimiter 中间件(internal/middleware/ratelimit.go)
|
||||
- **用途**:通过限制请求速率保护 API 免受滥用
|
||||
- **行为**:
|
||||
- 按客户端 IP 地址追踪请求
|
||||
@@ -550,7 +594,7 @@ junhong_cmp_fiber/
|
||||
- `redis`:基于 Redis(分布式,持久化)
|
||||
- **错误码**:1003(请求过于频繁)
|
||||
|
||||
#### 6. 路由处理器
|
||||
#### 7. 路由处理器
|
||||
- **用途**:执行端点的业务逻辑
|
||||
- **可用上下文数据**:
|
||||
- 请求 ID:`c.Locals(constants.ContextKeyRequestID)`
|
||||
@@ -564,6 +608,12 @@ junhong_cmp_fiber/
|
||||
app.Use(recover.New())
|
||||
app.Use(addRequestID())
|
||||
app.Use(loggerMiddleware())
|
||||
app.Use(cors.New(cors.Config{
|
||||
AllowOrigins: config.GetConfig().Middleware.CORS.AllowOrigins,
|
||||
AllowMethods: config.GetConfig().Middleware.CORS.AllowMethods,
|
||||
AllowHeaders: config.GetConfig().Middleware.CORS.AllowHeaders,
|
||||
AllowCredentials: config.GetConfig().Middleware.CORS.AllowCredentials,
|
||||
}))
|
||||
|
||||
// 模块化路由注册(认证中间件按路由组配置)
|
||||
routes.RegisterRoutes(app, handlers, middlewares)
|
||||
@@ -873,6 +923,7 @@ rdb.Set(ctx, key, status, time.Hour)
|
||||
- **[限流指南](docs/rate-limiting.md)**:全面的限流配置和使用
|
||||
- **[错误处理使用指南](docs/003-error-handling/使用指南.md)**:错误码参考、Handler 使用、客户端处理、最佳实践
|
||||
- **[错误处理架构说明](docs/003-error-handling/架构说明.md)**:架构设计、性能优化、扩展性说明
|
||||
- **[订单操作者与产业链佣金语义修复](docs/feature-001-order-operator-and-chain-commission-semantics/功能总结.md)**:说明订单操作者账号化、佣金流程状态与业务结果拆分、以及手工验收口径
|
||||
|
||||
### 架构设计
|
||||
|
||||
|
||||
@@ -5,8 +5,6 @@ import (
|
||||
"go.uber.org/zap"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/bootstrap"
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
apphandler "github.com/break/junhong_cmp_fiber/internal/handler/app"
|
||||
"github.com/break/junhong_cmp_fiber/internal/routes"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
@@ -22,22 +20,14 @@ func generateOpenAPIDocs(outputPath string, logger *zap.Logger) {
|
||||
// 2. 创建临时 Fiber App 用于路由注册
|
||||
app := fiber.New()
|
||||
|
||||
// 3. 创建 Handler(使用 nil 依赖,因为只需要路由结构)
|
||||
// 3. 创建所有 Handler(使用 nil 依赖,因为只需要路由结构)
|
||||
// 新增 Handler 必须注册到 openapi.BuildDocHandlers,代理开放接口也从该入口进入文档生成器。
|
||||
handlers := openapi.BuildDocHandlers()
|
||||
handlers.AssetLifecycle = admin.NewAssetLifecycleHandler(nil)
|
||||
handlers.ClientAuth = apphandler.NewClientAuthHandler(nil, nil)
|
||||
handlers.ClientAsset = apphandler.NewClientAssetHandler(nil, nil, nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.ClientWallet = apphandler.NewClientWalletHandler(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.ClientOrder = apphandler.NewClientOrderHandler(nil, nil)
|
||||
handlers.ClientExchange = apphandler.NewClientExchangeHandler(nil)
|
||||
handlers.ClientRealname = apphandler.NewClientRealnameHandler(nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.ClientDevice = apphandler.NewClientDeviceHandler(nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.AdminExchange = admin.NewExchangeHandler(nil, nil)
|
||||
|
||||
// 4. 注册所有路由到文档生成器
|
||||
routes.RegisterRoutesWithDoc(app, handlers, &bootstrap.Middlewares{}, adminDoc)
|
||||
|
||||
// 6. 保存规范到指定路径
|
||||
// 5. 保存规范到指定路径
|
||||
if err := adminDoc.Save(outputPath); err != nil {
|
||||
logger.Error("生成 OpenAPI 文档失败", zap.String("path", outputPath), zap.Error(err))
|
||||
return
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
stdErrors "errors"
|
||||
"os"
|
||||
"os/signal"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/bytedance/sonic"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/gofiber/fiber/v2/middleware/compress"
|
||||
"github.com/gofiber/fiber/v2/middleware/cors"
|
||||
"github.com/gofiber/fiber/v2/middleware/requestid"
|
||||
"github.com/google/uuid"
|
||||
"github.com/redis/go-redis/v9"
|
||||
@@ -197,19 +201,76 @@ func closeQueue(queueClient *queue.Client, appLogger *zap.Logger) {
|
||||
|
||||
// createFiberApp 创建 Fiber 应用
|
||||
func createFiberApp(cfg *config.Config, appLogger *zap.Logger) *fiber.App {
|
||||
registerTimeParserCompat()
|
||||
|
||||
return fiber.New(fiber.Config{
|
||||
AppName: "君鸿卡管系统 v1.0.0",
|
||||
StrictRouting: true,
|
||||
CaseSensitive: true,
|
||||
JSONEncoder: sonic.Marshal,
|
||||
JSONDecoder: sonic.Unmarshal,
|
||||
Prefork: cfg.Server.Prefork,
|
||||
ReadTimeout: cfg.Server.ReadTimeout,
|
||||
WriteTimeout: cfg.Server.WriteTimeout,
|
||||
ErrorHandler: internalMiddleware.ErrorHandler(appLogger),
|
||||
AppName: "君鸿卡管系统 v1.0.0",
|
||||
StrictRouting: true,
|
||||
CaseSensitive: true,
|
||||
JSONEncoder: sonic.Marshal,
|
||||
JSONDecoder: sonic.Unmarshal,
|
||||
EnableSplittingOnParsers: true,
|
||||
Prefork: cfg.Server.Prefork,
|
||||
ReadTimeout: cfg.Server.ReadTimeout,
|
||||
WriteTimeout: cfg.Server.WriteTimeout,
|
||||
ErrorHandler: internalMiddleware.ErrorHandler(appLogger),
|
||||
})
|
||||
}
|
||||
|
||||
// registerTimeParserCompat 注册时间参数解析兼容器
|
||||
// 兼容格式:RFC3339、2006-01-02、2006-01-02 15:04:05、2006-01-02T15:04:05
|
||||
func registerTimeParserCompat() {
|
||||
fiber.SetParserDecoder(fiber.ParserConfig{
|
||||
IgnoreUnknownKeys: true,
|
||||
ZeroEmpty: true,
|
||||
ParserType: []fiber.ParserType{
|
||||
{
|
||||
Customtype: time.Time{},
|
||||
Converter: func(value string) reflect.Value {
|
||||
parsedTime, err := parseFlexibleTime(value)
|
||||
if err != nil {
|
||||
return reflect.Value{}
|
||||
}
|
||||
return reflect.ValueOf(parsedTime)
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// parseFlexibleTime 解析多种常见时间格式
|
||||
func parseFlexibleTime(value string) (time.Time, error) {
|
||||
trimmed := strings.TrimSpace(value)
|
||||
if trimmed == "" {
|
||||
return time.Time{}, nil
|
||||
}
|
||||
|
||||
// 优先支持带时区的标准时间格式。
|
||||
if parsed, err := time.Parse(time.RFC3339, trimmed); err == nil {
|
||||
return parsed, nil
|
||||
}
|
||||
|
||||
// 兼容无时区格式,按服务器本地时区解析。
|
||||
layouts := []string{
|
||||
"2006-01-02 15:04:05",
|
||||
"2006-01-02T15:04:05",
|
||||
"2006-01-02",
|
||||
}
|
||||
var parseErr error
|
||||
for _, layout := range layouts {
|
||||
if parsed, err := time.ParseInLocation(layout, trimmed, time.Local); err == nil {
|
||||
return parsed, nil
|
||||
} else {
|
||||
parseErr = err
|
||||
}
|
||||
}
|
||||
|
||||
if parseErr == nil {
|
||||
parseErr = stdErrors.New("时间格式不支持")
|
||||
}
|
||||
return time.Time{}, parseErr
|
||||
}
|
||||
|
||||
// initMiddleware 注册中间件
|
||||
func initMiddleware(app *fiber.App, cfg *config.Config, appLogger *zap.Logger) {
|
||||
// 1. Recover - 必须第一个,捕获所有 panic
|
||||
@@ -229,6 +290,23 @@ func initMiddleware(app *fiber.App, cfg *config.Config, appLogger *zap.Logger) {
|
||||
|
||||
// 4. Logger - 记录所有请求(在 Compress 之后注册,读到的是未压缩的原始响应体)
|
||||
app.Use(logger.Middleware())
|
||||
|
||||
// 5. CORS - 必须在业务路由和认证中间件之前注册,确保预检请求不被认证拦截
|
||||
if cfg.Middleware.CORS.Enabled {
|
||||
app.Use(cors.New(cors.Config{
|
||||
AllowOrigins: cfg.Middleware.CORS.AllowOrigins,
|
||||
AllowMethods: cfg.Middleware.CORS.AllowMethods,
|
||||
AllowHeaders: cfg.Middleware.CORS.AllowHeaders,
|
||||
ExposeHeaders: cfg.Middleware.CORS.ExposeHeaders,
|
||||
AllowCredentials: cfg.Middleware.CORS.AllowCredentials,
|
||||
MaxAge: cfg.Middleware.CORS.MaxAge,
|
||||
}))
|
||||
appLogger.Info("CORS 中间件已启用",
|
||||
zap.String("allow_origins", cfg.Middleware.CORS.AllowOrigins),
|
||||
zap.String("allow_methods", cfg.Middleware.CORS.AllowMethods),
|
||||
zap.Bool("allow_credentials", cfg.Middleware.CORS.AllowCredentials),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// initRoutes 注册路由
|
||||
|
||||
@@ -7,8 +7,6 @@ import (
|
||||
"github.com/gofiber/fiber/v2"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/bootstrap"
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/admin"
|
||||
apphandler "github.com/break/junhong_cmp_fiber/internal/handler/app"
|
||||
"github.com/break/junhong_cmp_fiber/internal/routes"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/openapi"
|
||||
)
|
||||
@@ -31,17 +29,9 @@ func generateAdminDocs(outputPath string) error {
|
||||
// 2. 创建临时 Fiber App 用于路由注册
|
||||
app := fiber.New()
|
||||
|
||||
// 3. 创建 Handler(使用 nil 依赖,因为只需要路由结构)
|
||||
// 3. 创建所有 Handler(使用 nil 依赖,因为只需要路由结构)
|
||||
// 新增 Handler 必须注册到 openapi.BuildDocHandlers,代理开放接口也从该入口进入文档生成器。
|
||||
handlers := openapi.BuildDocHandlers()
|
||||
handlers.AssetLifecycle = admin.NewAssetLifecycleHandler(nil)
|
||||
handlers.ClientAuth = apphandler.NewClientAuthHandler(nil, nil)
|
||||
handlers.ClientAsset = apphandler.NewClientAssetHandler(nil, nil, nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.ClientWallet = apphandler.NewClientWalletHandler(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.ClientOrder = apphandler.NewClientOrderHandler(nil, nil)
|
||||
handlers.ClientExchange = apphandler.NewClientExchangeHandler(nil)
|
||||
handlers.ClientRealname = apphandler.NewClientRealnameHandler(nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.ClientDevice = apphandler.NewClientDeviceHandler(nil, nil, nil, nil, nil, nil, nil)
|
||||
handlers.AdminExchange = admin.NewExchangeHandler(nil, nil)
|
||||
|
||||
// 4. 注册所有路由到文档生成器
|
||||
routes.RegisterRoutesWithDoc(app, handlers, &bootstrap.Middlewares{}, adminDoc)
|
||||
|
||||
293
cmd/migration-finalize/main.go
Normal file
293
cmd/migration-finalize/main.go
Normal file
@@ -0,0 +1,293 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.uber.org/zap"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/polling"
|
||||
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||||
pkgbootstrap "github.com/break/junhong_cmp_fiber/pkg/bootstrap"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/config"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/database"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/logger"
|
||||
)
|
||||
|
||||
type finalizeOptions struct {
|
||||
batchNo string
|
||||
apply bool
|
||||
batchSize int
|
||||
timeout time.Duration
|
||||
}
|
||||
|
||||
type finalizeStats struct {
|
||||
importedTotal int64
|
||||
pollingCards int
|
||||
enqueuedCards int
|
||||
skippedNoConfig int
|
||||
firstID uint
|
||||
lastID uint
|
||||
taskCounts map[string]int
|
||||
}
|
||||
|
||||
func main() {
|
||||
if err := run(); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "迁移收尾失败: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func run() error {
|
||||
opts := parseOptions()
|
||||
if strings.TrimSpace(opts.batchNo) == "" {
|
||||
return fmt.Errorf("batch-no 不能为空")
|
||||
}
|
||||
if opts.batchSize <= 0 {
|
||||
return fmt.Errorf("batch-size 必须大于 0")
|
||||
}
|
||||
|
||||
cfg, err := config.Load()
|
||||
if err != nil {
|
||||
return fmt.Errorf("加载配置失败: %w", err)
|
||||
}
|
||||
if _, err := pkgbootstrap.EnsureDirectories(cfg, nil); err != nil {
|
||||
return fmt.Errorf("初始化目录失败: %w", err)
|
||||
}
|
||||
if err := initLogger(cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = logger.Sync() }()
|
||||
|
||||
appLogger := logger.GetAppLogger()
|
||||
ctx, cancel := context.WithTimeout(context.Background(), opts.timeout)
|
||||
defer cancel()
|
||||
|
||||
db, err := database.InitPostgreSQL(&cfg.Database, appLogger)
|
||||
if err != nil {
|
||||
return fmt.Errorf("初始化 PostgreSQL 失败: %w", err)
|
||||
}
|
||||
defer closeDB(db, appLogger)
|
||||
|
||||
var redisClient *redis.Client
|
||||
if opts.apply {
|
||||
redisClient, err = initRedis(cfg, appLogger)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() {
|
||||
if closeErr := redisClient.Close(); closeErr != nil {
|
||||
appLogger.Error("关闭 Redis 连接失败", zap.Error(closeErr))
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
configStore := postgres.NewPollingConfigStore(db)
|
||||
configMgr := polling.NewPollingConfigManager(configStore, redisClient, appLogger)
|
||||
if opts.apply {
|
||||
if err := configMgr.Load(ctx); err != nil {
|
||||
return fmt.Errorf("加载轮询配置失败: %w", err)
|
||||
}
|
||||
} else {
|
||||
if err := configMgr.LoadForInspection(ctx); err != nil {
|
||||
return fmt.Errorf("加载轮询配置失败: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
var queueMgr *polling.PollingQueueManager
|
||||
var initializer *polling.PollingInitializer
|
||||
if opts.apply {
|
||||
queueMgr = polling.NewPollingQueueManager(redisClient, constants.PollingShardCount, appLogger)
|
||||
cardStore := postgres.NewIotCardStore(db, redisClient)
|
||||
initializer = polling.NewPollingInitializer(cardStore, redisClient, configMgr, queueMgr, appLogger)
|
||||
}
|
||||
|
||||
stats, err := finalizePolling(ctx, db, configMgr, queueMgr, initializer, opts)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
printStats(stats, opts)
|
||||
return nil
|
||||
}
|
||||
|
||||
func parseOptions() finalizeOptions {
|
||||
opts := finalizeOptions{}
|
||||
flag.StringVar(&opts.batchNo, "batch-no", "MIGRATION-QICHENG", "迁移批次号")
|
||||
flag.BoolVar(&opts.apply, "apply", false, "实际写入 Redis 轮询队列和卡缓存;默认只 dry-run")
|
||||
flag.IntVar(&opts.batchSize, "batch-size", 500, "每批处理卡数量")
|
||||
flag.DurationVar(&opts.timeout, "timeout", 10*time.Minute, "迁移收尾超时时间")
|
||||
flag.Parse()
|
||||
return opts
|
||||
}
|
||||
|
||||
func initLogger(cfg *config.Config) error {
|
||||
if err := logger.InitLoggers(
|
||||
cfg.Logging.Level,
|
||||
cfg.Logging.Development,
|
||||
logger.LogRotationConfig{
|
||||
Filename: cfg.Logging.AppLog.Filename,
|
||||
MaxSize: cfg.Logging.AppLog.MaxSize,
|
||||
MaxBackups: cfg.Logging.AppLog.MaxBackups,
|
||||
MaxAge: cfg.Logging.AppLog.MaxAge,
|
||||
Compress: cfg.Logging.AppLog.Compress,
|
||||
},
|
||||
logger.LogRotationConfig{
|
||||
Filename: cfg.Logging.AccessLog.Filename,
|
||||
MaxSize: cfg.Logging.AccessLog.MaxSize,
|
||||
MaxBackups: cfg.Logging.AccessLog.MaxBackups,
|
||||
MaxAge: cfg.Logging.AccessLog.MaxAge,
|
||||
Compress: cfg.Logging.AccessLog.Compress,
|
||||
},
|
||||
); err != nil {
|
||||
return fmt.Errorf("初始化日志失败: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func initRedis(cfg *config.Config, appLogger *zap.Logger) (*redis.Client, error) {
|
||||
redisAddr := cfg.Redis.Address + ":" + strconv.Itoa(cfg.Redis.Port)
|
||||
client, err := database.NewRedisClient(database.RedisConfig{
|
||||
Address: redisAddr,
|
||||
Password: cfg.Redis.Password,
|
||||
DB: cfg.Redis.DB,
|
||||
PoolSize: cfg.Redis.PoolSize,
|
||||
MinIdleConns: cfg.Redis.MinIdleConns,
|
||||
DialTimeout: cfg.Redis.DialTimeout,
|
||||
ReadTimeout: cfg.Redis.ReadTimeout,
|
||||
WriteTimeout: cfg.Redis.WriteTimeout,
|
||||
}, appLogger)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("初始化 Redis 失败: %w", err)
|
||||
}
|
||||
return client, nil
|
||||
}
|
||||
|
||||
func closeDB(db *gorm.DB, appLogger *zap.Logger) {
|
||||
sqlDB, _ := db.DB()
|
||||
if sqlDB == nil {
|
||||
return
|
||||
}
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
appLogger.Error("关闭 PostgreSQL 连接失败", zap.Error(err))
|
||||
}
|
||||
}
|
||||
|
||||
func finalizePolling(
|
||||
ctx context.Context,
|
||||
db *gorm.DB,
|
||||
configMgr *polling.PollingConfigManager,
|
||||
queueMgr *polling.PollingQueueManager,
|
||||
initializer *polling.PollingInitializer,
|
||||
opts finalizeOptions,
|
||||
) (finalizeStats, error) {
|
||||
stats := finalizeStats{taskCounts: map[string]int{}}
|
||||
if err := db.WithContext(ctx).Model(&model.IotCard{}).
|
||||
Where("batch_no = ?", opts.batchNo).
|
||||
Count(&stats.importedTotal).Error; err != nil {
|
||||
return stats, fmt.Errorf("统计迁移卡失败: %w", err)
|
||||
}
|
||||
|
||||
var lastID uint
|
||||
for {
|
||||
cards, err := loadPollingCards(ctx, db, opts.batchNo, lastID, opts.batchSize)
|
||||
if err != nil {
|
||||
return stats, err
|
||||
}
|
||||
if len(cards) == 0 {
|
||||
break
|
||||
}
|
||||
|
||||
updateStats(&stats, configMgr, cards)
|
||||
if opts.apply {
|
||||
cardIDs := collectCardIDs(cards)
|
||||
if err := queueMgr.RemoveBatchFromCurrentShardQueues(ctx, cardIDs); err != nil {
|
||||
return stats, fmt.Errorf("清理轮询旧队列失败: %w", err)
|
||||
}
|
||||
if err := initializer.InitCards(ctx, cards); err != nil {
|
||||
return stats, fmt.Errorf("重建轮询队列失败: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
lastID = cards[len(cards)-1].ID
|
||||
}
|
||||
|
||||
return stats, nil
|
||||
}
|
||||
|
||||
func loadPollingCards(ctx context.Context, db *gorm.DB, batchNo string, lastID uint, limit int) ([]*model.IotCard, error) {
|
||||
var cards []*model.IotCard
|
||||
err := db.WithContext(ctx).
|
||||
Where("id > ? AND batch_no = ? AND enable_polling = true", lastID, batchNo).
|
||||
Order("id ASC").
|
||||
Limit(limit).
|
||||
Find(&cards).Error
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询迁移卡失败: %w", err)
|
||||
}
|
||||
return cards, nil
|
||||
}
|
||||
|
||||
func updateStats(stats *finalizeStats, configMgr *polling.PollingConfigManager, cards []*model.IotCard) {
|
||||
for _, card := range cards {
|
||||
stats.pollingCards++
|
||||
if stats.firstID == 0 {
|
||||
stats.firstID = card.ID
|
||||
}
|
||||
stats.lastID = card.ID
|
||||
|
||||
intervals := configMgr.MergedTaskIntervals(card)
|
||||
if len(intervals) == 0 {
|
||||
stats.skippedNoConfig++
|
||||
continue
|
||||
}
|
||||
stats.enqueuedCards++
|
||||
for taskType := range intervals {
|
||||
stats.taskCounts[taskType]++
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func collectCardIDs(cards []*model.IotCard) []uint {
|
||||
ids := make([]uint, 0, len(cards))
|
||||
for _, card := range cards {
|
||||
ids = append(ids, card.ID)
|
||||
}
|
||||
return ids
|
||||
}
|
||||
|
||||
func printStats(stats finalizeStats, opts finalizeOptions) {
|
||||
mode := "dry-run"
|
||||
if opts.apply {
|
||||
mode = "apply"
|
||||
}
|
||||
fmt.Printf("迁移收尾完成: mode=%s batch_no=%s\n", mode, opts.batchNo)
|
||||
fmt.Printf("导入卡总数: %d\n", stats.importedTotal)
|
||||
fmt.Printf("启用轮询卡: %d\n", stats.pollingCards)
|
||||
fmt.Printf("可入队卡: %d\n", stats.enqueuedCards)
|
||||
fmt.Printf("无匹配轮询配置: %d\n", stats.skippedNoConfig)
|
||||
if stats.firstID > 0 {
|
||||
fmt.Printf("处理 ID 范围: %d-%d\n", stats.firstID, stats.lastID)
|
||||
}
|
||||
|
||||
taskTypes := make([]string, 0, len(stats.taskCounts))
|
||||
for taskType := range stats.taskCounts {
|
||||
taskTypes = append(taskTypes, taskType)
|
||||
}
|
||||
sort.Strings(taskTypes)
|
||||
for _, taskType := range taskTypes {
|
||||
fmt.Printf("任务入队预估: %s=%d\n", taskType, stats.taskCounts[taskType])
|
||||
}
|
||||
if !opts.apply {
|
||||
fmt.Println("当前为 dry-run,没有写入 Redis;确认无误后增加 --apply 执行。")
|
||||
}
|
||||
}
|
||||
@@ -2,18 +2,21 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strconv"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/bytedance/sonic"
|
||||
"github.com/hibiken/asynq"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.uber.org/zap"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/bootstrap"
|
||||
"github.com/break/junhong_cmp_fiber/internal/gateway"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/polling"
|
||||
iot_card_svc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
|
||||
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
|
||||
@@ -25,14 +28,51 @@ import (
|
||||
"github.com/break/junhong_cmp_fiber/pkg/logger"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/queue"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/storage"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
const (
|
||||
workerModuleQueueServer = "queue_server"
|
||||
workerModulePollingInitializer = "polling_initializer"
|
||||
workerModulePollingScheduler = "polling_scheduler"
|
||||
workerModuleAsynqScheduler = "asynq_scheduler"
|
||||
importRescueLimit = 500 // 启动补偿单次扫描的最大导入任务数
|
||||
)
|
||||
|
||||
// workerModuleStatus 描述当前 Worker 角色下的模块启停计划。
|
||||
type workerModuleStatus struct {
|
||||
enabled []string
|
||||
disabled []string
|
||||
}
|
||||
|
||||
// workerRuntime 保存所有角色共享的 Worker 运行时依赖。
|
||||
type workerRuntime struct {
|
||||
redisAddr string
|
||||
redisClient *redis.Client
|
||||
db *gorm.DB
|
||||
storageSvc *storage.Service
|
||||
gatewayClient *gateway.Client
|
||||
asynqClient *asynq.Client
|
||||
workerResult *bootstrap.WorkerBootstrapResult
|
||||
workerServer *queue.Server
|
||||
pollingConfigMgr *polling.PollingConfigManager
|
||||
pollingQueueMgr *polling.PollingQueueManager
|
||||
pollingIotCardStore *postgres.IotCardStore
|
||||
pollingBase *task.PollingBase
|
||||
lifecycleSvc *polling.PollingLifecycleService
|
||||
}
|
||||
|
||||
func main() {
|
||||
cfg, err := config.Load()
|
||||
if err != nil {
|
||||
panic("加载配置失败: " + err.Error())
|
||||
}
|
||||
|
||||
runWorker(cfg)
|
||||
}
|
||||
|
||||
// runWorker 编排 Worker 进程启动、模块启停和优雅关闭流程。
|
||||
func runWorker(cfg *config.Config) {
|
||||
if _, err := pkgBootstrap.EnsureDirectories(cfg, nil); err != nil {
|
||||
panic("初始化目录失败: " + err.Error())
|
||||
}
|
||||
@@ -62,9 +102,91 @@ func main() {
|
||||
}()
|
||||
|
||||
appLogger := logger.GetAppLogger()
|
||||
appLogger.Info("Worker 服务启动中...")
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
// 连接 Redis
|
||||
moduleStatus := buildWorkerModuleStatus(cfg.Worker.Role)
|
||||
appLogger.Info("Worker 服务启动中...")
|
||||
logWorkerRole(appLogger, cfg.Worker.Role, cfg.Worker.InstanceName, moduleStatus)
|
||||
|
||||
runtime := initWorkerRuntime(ctx, cfg, appLogger)
|
||||
defer runtime.close(appLogger)
|
||||
|
||||
var pollingInitializer *polling.PollingInitializer
|
||||
var pollingScheduler *polling.Scheduler
|
||||
var asynqScheduler *asynq.Scheduler
|
||||
|
||||
if runsSingletonModules(cfg.Worker.Role) {
|
||||
pollingInitializer = startPollingInitializer(ctx, runtime, appLogger)
|
||||
pollingScheduler = startPollingScheduler(ctx, runtime, pollingInitializer, appLogger)
|
||||
asynqScheduler = startAsynqScheduler(cfg, runtime.redisAddr, appLogger)
|
||||
}
|
||||
|
||||
taskHandler := createTaskHandler(runtime, appLogger)
|
||||
taskHandler.RegisterHandlers()
|
||||
rescuePendingImportTasks(ctx, runtime, appLogger)
|
||||
|
||||
appLogger.Info("Worker 服务器配置完成",
|
||||
zap.Int("concurrency", cfg.Queue.Concurrency),
|
||||
zap.Any("queues", cfg.Queue.Queues))
|
||||
|
||||
quit := make(chan os.Signal, 1)
|
||||
signal.Notify(quit, os.Interrupt, syscall.SIGTERM)
|
||||
defer signal.Stop(quit)
|
||||
|
||||
go func() {
|
||||
if err := runtime.workerServer.Run(taskHandler.GetMux()); err != nil {
|
||||
appLogger.Fatal("Worker 服务器运行失败", zap.Error(err))
|
||||
}
|
||||
}()
|
||||
|
||||
appLogger.Info("Worker 服务器已启动")
|
||||
<-quit
|
||||
|
||||
shutdownWorker(cancel, appLogger, runtime.workerServer, pollingInitializer, pollingScheduler, asynqScheduler)
|
||||
}
|
||||
|
||||
// buildWorkerModuleStatus 根据角色生成启用/禁用模块列表,供启动日志和人工验收使用。
|
||||
func buildWorkerModuleStatus(role string) workerModuleStatus {
|
||||
status := workerModuleStatus{
|
||||
enabled: []string{workerModuleQueueServer},
|
||||
}
|
||||
|
||||
if runsSingletonModules(role) {
|
||||
status.enabled = append(
|
||||
status.enabled,
|
||||
workerModulePollingInitializer,
|
||||
workerModulePollingScheduler,
|
||||
workerModuleAsynqScheduler,
|
||||
)
|
||||
return status
|
||||
}
|
||||
|
||||
status.disabled = []string{
|
||||
workerModulePollingInitializer,
|
||||
workerModulePollingScheduler,
|
||||
workerModuleAsynqScheduler,
|
||||
}
|
||||
return status
|
||||
}
|
||||
|
||||
// logWorkerRole 输出当前实例角色、实例名以及模块启停计划。
|
||||
func logWorkerRole(appLogger *zap.Logger, role string, instanceName string, moduleStatus workerModuleStatus) {
|
||||
appLogger.Info("Worker 角色已确认",
|
||||
zap.String("role", role),
|
||||
zap.String("instance_name", instanceName))
|
||||
appLogger.Info("Worker 模块启停计划",
|
||||
zap.Strings("enabled_modules", moduleStatus.enabled),
|
||||
zap.Strings("disabled_modules", moduleStatus.disabled))
|
||||
}
|
||||
|
||||
// runsSingletonModules 判断当前角色是否承担主动调度和初始化职责。
|
||||
func runsSingletonModules(role string) bool {
|
||||
return role == constants.WorkerRoleAll || role == constants.WorkerRoleLeader
|
||||
}
|
||||
|
||||
// initWorkerRuntime 初始化所有角色共享的外部依赖和轮询运行时对象。
|
||||
func initWorkerRuntime(ctx context.Context, cfg *config.Config, appLogger *zap.Logger) *workerRuntime {
|
||||
redisAddr := cfg.Redis.Address + ":" + strconv.Itoa(cfg.Redis.Port)
|
||||
redisClient := redis.NewClient(&redis.Options{
|
||||
Addr: redisAddr,
|
||||
@@ -76,52 +198,26 @@ func main() {
|
||||
ReadTimeout: cfg.Redis.ReadTimeout,
|
||||
WriteTimeout: cfg.Redis.WriteTimeout,
|
||||
})
|
||||
defer func() {
|
||||
if err := redisClient.Close(); err != nil {
|
||||
appLogger.Error("关闭 Redis 客户端失败", zap.Error(err))
|
||||
}
|
||||
}()
|
||||
|
||||
// 测试 Redis 连接
|
||||
ctx := context.Background()
|
||||
if err := redisClient.Ping(ctx).Err(); err != nil {
|
||||
appLogger.Fatal("连接 Redis 失败", zap.Error(err))
|
||||
}
|
||||
appLogger.Info("Redis 已连接", zap.String("address", redisAddr))
|
||||
|
||||
// 初始化 PostgreSQL 连接
|
||||
db, err := database.InitPostgreSQL(&cfg.Database, appLogger)
|
||||
if err != nil {
|
||||
appLogger.Fatal("初始化 PostgreSQL 失败", zap.Error(err))
|
||||
}
|
||||
defer func() {
|
||||
sqlDB, _ := db.DB()
|
||||
if sqlDB != nil {
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
appLogger.Error("关闭 PostgreSQL 连接失败", zap.Error(err))
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
// 初始化对象存储服务(可选)
|
||||
storageSvc := initStorage(cfg, appLogger)
|
||||
|
||||
// 初始化 Gateway 客户端(可选,用于轮询任务)
|
||||
gatewayClient := initGateway(cfg, appLogger)
|
||||
|
||||
// 创建 Asynq 客户端(用于调度器提交任务)
|
||||
asynqClient := asynq.NewClient(asynq.RedisClientOpt{
|
||||
Addr: redisAddr,
|
||||
Password: cfg.Redis.Password,
|
||||
DB: cfg.Redis.DB,
|
||||
})
|
||||
defer func() {
|
||||
if err := asynqClient.Close(); err != nil {
|
||||
appLogger.Error("关闭 Asynq 客户端失败", zap.Error(err))
|
||||
}
|
||||
}()
|
||||
|
||||
// 创建 Worker 依赖
|
||||
workerDeps := &bootstrap.WorkerDependencies{
|
||||
DB: db,
|
||||
Redis: redisClient,
|
||||
@@ -131,16 +227,13 @@ func main() {
|
||||
GatewayClient: gatewayClient,
|
||||
}
|
||||
|
||||
// Bootstrap Worker 组件
|
||||
workerResult, err := bootstrap.BootstrapWorker(workerDeps)
|
||||
if err != nil {
|
||||
appLogger.Fatal("Worker Bootstrap 失败", zap.Error(err))
|
||||
}
|
||||
|
||||
// 创建 Asynq Worker 服务器
|
||||
workerServer := queue.NewServer(redisClient, &cfg.Queue, appLogger)
|
||||
|
||||
// 初始化轮询系统新组件(Phase 5.7)
|
||||
pollingConfigStore := postgres.NewPollingConfigStore(db)
|
||||
pollingConfigMgr := polling.NewPollingConfigManager(pollingConfigStore, redisClient, appLogger)
|
||||
if err := pollingConfigMgr.Load(ctx); err != nil {
|
||||
@@ -149,46 +242,131 @@ func main() {
|
||||
pollingConfigMgr.Start(ctx)
|
||||
|
||||
pollingQueueMgr := polling.NewPollingQueueManager(redisClient, constants.PollingShardCount, appLogger)
|
||||
|
||||
pollingIotCardStore := postgres.NewIotCardStore(db, redisClient)
|
||||
pollingBase := task.NewPollingBase(redisClient, pollingQueueMgr, pollingConfigMgr, pollingIotCardStore, appLogger)
|
||||
pollingBase := task.NewPollingBase(
|
||||
redisClient,
|
||||
pollingQueueMgr,
|
||||
pollingConfigMgr,
|
||||
pollingIotCardStore,
|
||||
appLogger,
|
||||
cfg.Polling.VerboseLog,
|
||||
)
|
||||
|
||||
// 后台渐进式初始化(将全量卡数据写入分片 Sorted Set)
|
||||
pollingInitializer := polling.NewPollingInitializer(pollingIotCardStore, redisClient, pollingConfigMgr, pollingQueueMgr, appLogger)
|
||||
pollingInitializer.StartBackground(ctx)
|
||||
|
||||
// 创建生命周期服务(Worker 进程用,功能更完整)
|
||||
pollingDeviceSimBindingStore := postgres.NewDeviceSimBindingStore(db, redisClient)
|
||||
pollingDeviceStore := postgres.NewDeviceStore(db, redisClient)
|
||||
lifecycleSvc := polling.NewPollingLifecycleService(pollingQueueMgr, pollingConfigMgr, pollingIotCardStore, pollingDeviceSimBindingStore, pollingDeviceStore, appLogger)
|
||||
|
||||
// 初始化调度器(激活/重置 Handler 通过构造函数注入,防止遗漏)
|
||||
dataResetHandler := polling.NewDataResetHandler(workerResult.Services.ResetService, appLogger)
|
||||
activationHandler := polling.NewPackageActivationHandler(
|
||||
db, redisClient, asynqClient,
|
||||
workerResult.Services.ActivationService,
|
||||
workerResult.Services.StopResumeService,
|
||||
lifecycleSvc := polling.NewPollingLifecycleService(
|
||||
pollingQueueMgr,
|
||||
pollingConfigMgr,
|
||||
pollingIotCardStore,
|
||||
pollingDeviceSimBindingStore,
|
||||
pollingDeviceStore,
|
||||
appLogger,
|
||||
)
|
||||
scheduler := polling.NewScheduler(redisClient, asynqClient, pollingQueueMgr, pollingConfigMgr, appLogger, activationHandler, dataResetHandler)
|
||||
|
||||
if err := scheduler.Start(ctx); err != nil {
|
||||
appLogger.Error("启动轮询调度器失败", zap.Error(err))
|
||||
} else {
|
||||
appLogger.Info("轮询调度器已启动")
|
||||
if stopResumeSvc, ok := workerResult.Services.StopResumeService.(*iot_card_svc.StopResumeService); ok {
|
||||
stopResumeSvc.SetPollingCallback(lifecycleSvc)
|
||||
}
|
||||
|
||||
// 类型断言:StopResumeService 实际是 *iotCardSvc.StopResumeService,实现了 EvaluateAndAct 接口
|
||||
stopResumeSvc, _ := workerResult.Services.StopResumeService.(iot_card_svc.StopResumeServiceInterface)
|
||||
// 创建任务处理器并注册
|
||||
taskHandler := queue.NewHandler(db, redisClient, storageSvc, gatewayClient, lifecycleSvc, workerResult, asynqClient, appLogger, pollingBase, stopResumeSvc)
|
||||
taskHandler.RegisterHandlers()
|
||||
return &workerRuntime{
|
||||
redisAddr: redisAddr,
|
||||
redisClient: redisClient,
|
||||
db: db,
|
||||
storageSvc: storageSvc,
|
||||
gatewayClient: gatewayClient,
|
||||
asynqClient: asynqClient,
|
||||
workerResult: workerResult,
|
||||
workerServer: workerServer,
|
||||
pollingConfigMgr: pollingConfigMgr,
|
||||
pollingQueueMgr: pollingQueueMgr,
|
||||
pollingIotCardStore: pollingIotCardStore,
|
||||
pollingBase: pollingBase,
|
||||
lifecycleSvc: lifecycleSvc,
|
||||
}
|
||||
}
|
||||
|
||||
appLogger.Info("Worker 服务器配置完成",
|
||||
zap.Int("concurrency", cfg.Queue.Concurrency),
|
||||
zap.Any("queues", cfg.Queue.Queues))
|
||||
// close 在 Worker 退出时关闭共享客户端与数据库连接。
|
||||
func (r *workerRuntime) close(appLogger *zap.Logger) {
|
||||
if r.asynqClient != nil {
|
||||
if err := r.asynqClient.Close(); err != nil {
|
||||
appLogger.Error("关闭 Asynq 客户端失败", zap.Error(err))
|
||||
}
|
||||
}
|
||||
if r.db != nil {
|
||||
sqlDB, _ := r.db.DB()
|
||||
if sqlDB != nil {
|
||||
if err := sqlDB.Close(); err != nil {
|
||||
appLogger.Error("关闭 PostgreSQL 连接失败", zap.Error(err))
|
||||
}
|
||||
}
|
||||
}
|
||||
if r.redisClient != nil {
|
||||
if err := r.redisClient.Close(); err != nil {
|
||||
appLogger.Error("关闭 Redis 客户端失败", zap.Error(err))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 创建 Asynq Scheduler(定时任务调度器:订单超时、告警检查、数据清理)
|
||||
// startPollingInitializer 为 leader/all 启动渐进式初始化器,并保留配置变更重启逻辑。
|
||||
func startPollingInitializer(ctx context.Context, runtime *workerRuntime, appLogger *zap.Logger) *polling.PollingInitializer {
|
||||
pollingInitializer := polling.NewPollingInitializer(
|
||||
runtime.pollingIotCardStore,
|
||||
runtime.redisClient,
|
||||
runtime.pollingConfigMgr,
|
||||
runtime.pollingQueueMgr,
|
||||
appLogger,
|
||||
)
|
||||
pollingInitializer.StartBackground(ctx)
|
||||
|
||||
runtime.pollingConfigMgr.WatchChanges(ctx, func(hadConfigs, hasConfigs bool) {
|
||||
if hasConfigs {
|
||||
appLogger.Info("轮询配置已变更,触发队列重新初始化",
|
||||
zap.Bool("had_configs", hadConfigs))
|
||||
pollingInitializer.Restart(ctx)
|
||||
return
|
||||
}
|
||||
appLogger.Info("轮询配置已清空,跳过队列重新初始化")
|
||||
})
|
||||
|
||||
return pollingInitializer
|
||||
}
|
||||
|
||||
// startPollingScheduler 为 leader/all 启动轮询调度器。
|
||||
func startPollingScheduler(
|
||||
ctx context.Context,
|
||||
runtime *workerRuntime,
|
||||
pollingInitializer *polling.PollingInitializer,
|
||||
appLogger *zap.Logger,
|
||||
) *polling.Scheduler {
|
||||
dataResetHandler := polling.NewDataResetHandler(runtime.workerResult.Services.ResetService, appLogger)
|
||||
activationHandler := polling.NewPackageActivationHandler(
|
||||
runtime.db,
|
||||
runtime.redisClient,
|
||||
runtime.asynqClient,
|
||||
runtime.workerResult.Services.ActivationService,
|
||||
runtime.workerResult.Services.StopResumeService,
|
||||
appLogger,
|
||||
)
|
||||
|
||||
pollingScheduler := polling.NewScheduler(
|
||||
runtime.redisClient,
|
||||
runtime.asynqClient,
|
||||
runtime.pollingQueueMgr,
|
||||
runtime.pollingConfigMgr,
|
||||
appLogger,
|
||||
activationHandler,
|
||||
dataResetHandler,
|
||||
)
|
||||
pollingScheduler.SetInitializer(pollingInitializer)
|
||||
|
||||
if err := pollingScheduler.Start(ctx); err != nil {
|
||||
appLogger.Error("启动轮询调度器失败", zap.Error(err))
|
||||
return nil
|
||||
}
|
||||
|
||||
return pollingScheduler
|
||||
}
|
||||
|
||||
// startAsynqScheduler 为 leader/all 创建并启动 Asynq Scheduler。
|
||||
func startAsynqScheduler(cfg *config.Config, redisAddr string, appLogger *zap.Logger) *asynq.Scheduler {
|
||||
asynqScheduler := asynq.NewScheduler(
|
||||
asynq.RedisClientOpt{
|
||||
Addr: redisAddr,
|
||||
@@ -198,57 +376,174 @@ func main() {
|
||||
&asynq.SchedulerOpts{Location: time.Local},
|
||||
)
|
||||
|
||||
// 注册定时任务:订单超时检查(每分钟)
|
||||
if _, err := asynqScheduler.Register("@every 1m", asynq.NewTask(constants.TaskTypeOrderExpire, nil)); err != nil {
|
||||
appLogger.Fatal("注册订单超时定时任务失败", zap.Error(err))
|
||||
}
|
||||
// 注册定时任务:告警检查(每分钟)
|
||||
if _, err := asynqScheduler.Register("@every 1m", asynq.NewTask(constants.TaskTypeAlertCheck, nil)); err != nil {
|
||||
appLogger.Fatal("注册告警检查定时任务失败", zap.Error(err))
|
||||
}
|
||||
// 注册定时任务:数据清理(每天凌晨 2 点)
|
||||
if _, err := asynqScheduler.Register("0 2 * * *", asynq.NewTask(constants.TaskTypeDataCleanup, nil)); err != nil {
|
||||
appLogger.Fatal("注册数据清理定时任务失败", zap.Error(err))
|
||||
}
|
||||
// 注册定时任务:每日流量落盘(每天凌晨 2 点,超时 5 分钟)
|
||||
if _, err := asynqScheduler.Register("0 2 * * *", asynq.NewTask(constants.TaskTypeDailyTrafficFlush, nil, asynq.MaxRetry(3), asynq.Timeout(5*time.Minute))); err != nil {
|
||||
appLogger.Fatal("注册每日流量落盘定时任务失败", zap.Error(err))
|
||||
if err := registerAsynqScheduleTasks(asynqScheduler); err != nil {
|
||||
appLogger.Fatal("注册 Asynq 定时任务失败", zap.Error(err))
|
||||
}
|
||||
|
||||
// 启动 Asynq Scheduler
|
||||
go func() {
|
||||
if err := asynqScheduler.Run(); err != nil {
|
||||
appLogger.Fatal("Asynq Scheduler 启动失败", zap.Error(err))
|
||||
}
|
||||
}()
|
||||
appLogger.Info("Asynq Scheduler 已启动(订单超时: @every 1m, 告警检查: @every 1m, 数据清理: 0 2 * * *)")
|
||||
|
||||
// 优雅关闭
|
||||
quit := make(chan os.Signal, 1)
|
||||
signal.Notify(quit, os.Interrupt, syscall.SIGTERM)
|
||||
appLogger.Info("Asynq Scheduler 已启动(订单超时: @every 1m, 告警检查: @every 1m, 数据清理: 0 2 * * *, 每日流量落盘: 0 2 * * *)")
|
||||
return asynqScheduler
|
||||
}
|
||||
|
||||
// 启动 Worker 服务器(阻塞运行)
|
||||
go func() {
|
||||
if err := workerServer.Run(taskHandler.GetMux()); err != nil {
|
||||
appLogger.Fatal("Worker 服务器运行失败", zap.Error(err))
|
||||
}
|
||||
}()
|
||||
// registerAsynqScheduleTasks 注册 Worker 入口需要的全部定时任务。
|
||||
func registerAsynqScheduleTasks(asynqScheduler *asynq.Scheduler) error {
|
||||
if _, err := asynqScheduler.Register("@every 1m", asynq.NewTask(
|
||||
constants.TaskTypeOrderExpire,
|
||||
nil,
|
||||
asynq.Queue(constants.QueueForTaskType(constants.TaskTypeOrderExpire)),
|
||||
)); err != nil {
|
||||
return fmt.Errorf("注册订单超时定时任务失败: %w", err)
|
||||
}
|
||||
if _, err := asynqScheduler.Register("@every 1m", asynq.NewTask(
|
||||
constants.TaskTypeAlertCheck,
|
||||
nil,
|
||||
asynq.Queue(constants.QueueForTaskType(constants.TaskTypeAlertCheck)),
|
||||
)); err != nil {
|
||||
return fmt.Errorf("注册告警检查定时任务失败: %w", err)
|
||||
}
|
||||
if _, err := asynqScheduler.Register("0 2 * * *", asynq.NewTask(
|
||||
constants.TaskTypeDataCleanup,
|
||||
nil,
|
||||
asynq.Queue(constants.QueueForTaskType(constants.TaskTypeDataCleanup)),
|
||||
)); err != nil {
|
||||
return fmt.Errorf("注册数据清理定时任务失败: %w", err)
|
||||
}
|
||||
if _, err := asynqScheduler.Register(
|
||||
"0 2 * * *",
|
||||
asynq.NewTask(
|
||||
constants.TaskTypeDailyTrafficFlush,
|
||||
nil,
|
||||
asynq.MaxRetry(3),
|
||||
asynq.Timeout(5*time.Minute),
|
||||
asynq.Queue(constants.QueueForTaskType(constants.TaskTypeDailyTrafficFlush)),
|
||||
),
|
||||
); err != nil {
|
||||
return fmt.Errorf("注册每日流量落盘定时任务失败: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
appLogger.Info("Worker 服务器已启动")
|
||||
// createTaskHandler 创建并返回包含全部任务处理器的 Asynq Handler。
|
||||
func createTaskHandler(runtime *workerRuntime, appLogger *zap.Logger) *queue.Handler {
|
||||
stopResumeSvc, _ := runtime.workerResult.Services.StopResumeService.(iot_card_svc.StopResumeServiceInterface)
|
||||
return queue.NewHandler(
|
||||
runtime.db,
|
||||
runtime.redisClient,
|
||||
runtime.storageSvc,
|
||||
runtime.gatewayClient,
|
||||
runtime.lifecycleSvc,
|
||||
runtime.workerResult,
|
||||
runtime.asynqClient,
|
||||
appLogger,
|
||||
runtime.pollingBase,
|
||||
stopResumeSvc,
|
||||
)
|
||||
}
|
||||
|
||||
// 等待关闭信号
|
||||
<-quit
|
||||
// rescuePendingImportTasks 将历史遗留的待处理导入任务重新投递到独立导入队列。
|
||||
func rescuePendingImportTasks(ctx context.Context, runtime *workerRuntime, appLogger *zap.Logger) {
|
||||
rescuePendingIotCardImportTasks(ctx, runtime.db, runtime.asynqClient, appLogger)
|
||||
rescuePendingDeviceImportTasks(ctx, runtime.db, runtime.asynqClient, appLogger)
|
||||
}
|
||||
|
||||
// rescuePendingIotCardImportTasks 补偿仍停留在待处理状态的 IoT 卡导入任务。
|
||||
func rescuePendingIotCardImportTasks(ctx context.Context, db *gorm.DB, asynqClient *asynq.Client, appLogger *zap.Logger) {
|
||||
var importTasks []model.IotCardImportTask
|
||||
if err := db.WithContext(ctx).
|
||||
Where("status = ?", model.ImportTaskStatusPending).
|
||||
Limit(importRescueLimit).
|
||||
Find(&importTasks).Error; err != nil {
|
||||
appLogger.Warn("扫描待补偿 IoT 卡导入任务失败", zap.Error(err))
|
||||
return
|
||||
}
|
||||
|
||||
for _, importTask := range importTasks {
|
||||
payload := task.IotCardImportPayload{TaskID: importTask.ID}
|
||||
enqueueImportRescueTask(ctx, asynqClient, constants.TaskTypeIotCardImport, payload, importTask.ID, appLogger)
|
||||
}
|
||||
}
|
||||
|
||||
// rescuePendingDeviceImportTasks 补偿仍停留在待处理状态的设备导入任务。
|
||||
func rescuePendingDeviceImportTasks(ctx context.Context, db *gorm.DB, asynqClient *asynq.Client, appLogger *zap.Logger) {
|
||||
var importTasks []model.DeviceImportTask
|
||||
if err := db.WithContext(ctx).
|
||||
Where("status = ?", model.ImportTaskStatusPending).
|
||||
Limit(importRescueLimit).
|
||||
Find(&importTasks).Error; err != nil {
|
||||
appLogger.Warn("扫描待补偿设备导入任务失败", zap.Error(err))
|
||||
return
|
||||
}
|
||||
|
||||
for _, importTask := range importTasks {
|
||||
payload := task.DeviceImportPayload{TaskID: importTask.ID}
|
||||
enqueueImportRescueTask(ctx, asynqClient, constants.TaskTypeDeviceImport, payload, importTask.ID, appLogger)
|
||||
}
|
||||
}
|
||||
|
||||
// enqueueImportRescueTask 将补偿任务提交到任务类型对应的独立队列。
|
||||
func enqueueImportRescueTask(ctx context.Context, asynqClient *asynq.Client, taskType string, payload any, taskID uint, appLogger *zap.Logger) {
|
||||
payloadBytes, err := sonic.Marshal(payload)
|
||||
if err != nil {
|
||||
appLogger.Warn("序列化导入补偿任务载荷失败",
|
||||
zap.String("task_type", taskType),
|
||||
zap.Uint("task_id", taskID),
|
||||
zap.Error(err))
|
||||
return
|
||||
}
|
||||
|
||||
queueName := constants.QueueForTaskType(taskType)
|
||||
taskMessage := asynq.NewTask(
|
||||
taskType,
|
||||
payloadBytes,
|
||||
asynq.Queue(queueName),
|
||||
asynq.TaskID(fmt.Sprintf("import-rescue:%s:%d", taskType, taskID)),
|
||||
asynq.Unique(30*time.Minute),
|
||||
)
|
||||
if _, err := asynqClient.EnqueueContext(ctx, taskMessage); err != nil {
|
||||
appLogger.Warn("提交导入补偿任务失败",
|
||||
zap.String("task_type", taskType),
|
||||
zap.String("queue", queueName),
|
||||
zap.Uint("task_id", taskID),
|
||||
zap.Error(err))
|
||||
return
|
||||
}
|
||||
|
||||
appLogger.Info("导入补偿任务已提交",
|
||||
zap.String("task_type", taskType),
|
||||
zap.String("queue", queueName),
|
||||
zap.Uint("task_id", taskID))
|
||||
}
|
||||
|
||||
// shutdownWorker 按当前实例实际启动过的模块执行优雅关闭。
|
||||
func shutdownWorker(
|
||||
cancel context.CancelFunc,
|
||||
appLogger *zap.Logger,
|
||||
workerServer *queue.Server,
|
||||
pollingInitializer *polling.PollingInitializer,
|
||||
pollingScheduler *polling.Scheduler,
|
||||
asynqScheduler *asynq.Scheduler,
|
||||
) {
|
||||
appLogger.Info("正在关闭 Worker 服务器...")
|
||||
|
||||
// 停止 Asynq Scheduler
|
||||
asynqScheduler.Shutdown()
|
||||
if asynqScheduler != nil {
|
||||
asynqScheduler.Shutdown()
|
||||
}
|
||||
if pollingScheduler != nil {
|
||||
pollingScheduler.Stop()
|
||||
}
|
||||
|
||||
// 停止轮询调度器
|
||||
scheduler.Stop()
|
||||
cancel()
|
||||
|
||||
if pollingInitializer != nil {
|
||||
pollingInitializer.Stop()
|
||||
}
|
||||
|
||||
// 优雅关闭 Worker 服务器(等待正在执行的任务完成)
|
||||
workerServer.Shutdown()
|
||||
|
||||
appLogger.Info("Worker 服务器已停止")
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ version: '3.8'
|
||||
# - Gateway 服务配置(JUNHONG_GATEWAY_*)
|
||||
# - 对象存储配置(JUNHONG_STORAGE_*)
|
||||
# - 短信服务配置(JUNHONG_SMS_*)
|
||||
# - 客户端手机号绑定开关(JUNHONG_CLIENT_REQUIRE_PHONE_BINDING,默认 true)
|
||||
#
|
||||
# 微信公众号/小程序/支付配置已迁移至数据库(tb_wechat_config 表),
|
||||
# 不再需要环境变量和证书文件挂载。
|
||||
@@ -50,9 +51,15 @@ services:
|
||||
- JUNHONG_REDIS_DB=6
|
||||
# JWT 配置(必填)
|
||||
- JUNHONG_JWT_SECRET_KEY=dev-secret-key-for-testing-only-32chars!
|
||||
# 客户端配置(可选,默认 true;false=不强制绑定手机号)
|
||||
- JUNHONG_CLIENT_REQUIRE_PHONE_BINDING=false
|
||||
# 日志配置
|
||||
- JUNHONG_LOGGING_LEVEL=info
|
||||
- JUNHONG_LOGGING_DEVELOPMENT=false
|
||||
# 跨域配置
|
||||
- JUNHONG_MIDDLEWARE_CORS_ENABLED=true
|
||||
- JUNHONG_MIDDLEWARE_CORS_ALLOW_ORIGINS=*
|
||||
- JUNHONG_MIDDLEWARE_CORS_ALLOW_CREDENTIALS=false
|
||||
# 对象存储配置
|
||||
- JUNHONG_STORAGE_PROVIDER=s3
|
||||
- JUNHONG_STORAGE_S3_ENDPOINT=https://obs-helf.cucloud.cn
|
||||
@@ -63,7 +70,7 @@ services:
|
||||
- JUNHONG_STORAGE_S3_USE_SSL=false
|
||||
- JUNHONG_STORAGE_S3_PATH_STYLE=true
|
||||
# Gateway 配置(可选)
|
||||
- JUNHONG_GATEWAY_BASE_URL=https://lplan.whjhft.com/openapi
|
||||
- JUNHONG_GATEWAY_BASE_URL=https://open.whjhft.com/openapi
|
||||
- JUNHONG_GATEWAY_APP_ID=LfjL0WjUqpwkItQ0
|
||||
- JUNHONG_GATEWAY_APP_SECRET=K0DYuWzbRE6zg5bX
|
||||
- JUNHONG_GATEWAY_TIMEOUT=30
|
||||
@@ -72,6 +79,9 @@ services:
|
||||
- JUNHONG_SMS_USERNAME=JH0001
|
||||
- JUNHONG_SMS_PASSWORD=wwR8E4qnL6F0
|
||||
- JUNHONG_SMS_SIGNATURE=【JHFTIOT】
|
||||
- JUNHONG_MIDDLEWARE_CORS_ENABLED=true
|
||||
- JUNHONG_MIDDLEWARE_CORS_ALLOW_ORIGINS=https://cmp-admin.boss160.cn,https://cmp-agent.boss160.cn,https://cmp-c.boss160.cn
|
||||
- JUNHONG_MIDDLEWARE_CORS_ALLOW_CREDENTIALS=true
|
||||
volumes:
|
||||
- ./logs:/app/logs
|
||||
networks:
|
||||
@@ -107,6 +117,8 @@ services:
|
||||
- JUNHONG_REDIS_DB=6
|
||||
# JWT 配置(必填)
|
||||
- JUNHONG_JWT_SECRET_KEY=dev-secret-key-for-testing-only-32chars!
|
||||
# 客户端配置(可选,默认 true;false=不强制绑定手机号)
|
||||
- JUNHONG_CLIENT_REQUIRE_PHONE_BINDING=false
|
||||
# 日志配置
|
||||
- JUNHONG_LOGGING_LEVEL=info
|
||||
- JUNHONG_LOGGING_DEVELOPMENT=false
|
||||
@@ -120,10 +132,11 @@ services:
|
||||
- JUNHONG_STORAGE_S3_USE_SSL=false
|
||||
- JUNHONG_STORAGE_S3_PATH_STYLE=true
|
||||
# Gateway 配置(可选)
|
||||
- JUNHONG_GATEWAY_BASE_URL=https://lplan.whjhft.com/openapi
|
||||
- JUNHONG_GATEWAY_BASE_URL=https://open.whjhft.com/openapi
|
||||
- JUNHONG_GATEWAY_APP_ID=LfjL0WjUqpwkItQ0
|
||||
- JUNHONG_GATEWAY_APP_SECRET=K0DYuWzbRE6zg5bX
|
||||
- JUNHONG_GATEWAY_TIMEOUT=30
|
||||
- JUNHONG_POLLING_VERBOSE_LOG=true
|
||||
volumes:
|
||||
- ./logs:/app/logs
|
||||
networks:
|
||||
|
||||
235
docs/COMMISSION_DOCS_INDEX.md
Normal file
235
docs/COMMISSION_DOCS_INDEX.md
Normal file
@@ -0,0 +1,235 @@
|
||||
# 差价佣金文档索引
|
||||
|
||||
本索引汇总了所有关于差价佣金计算和分配的文档,帮助快速定位所需信息。
|
||||
|
||||
## 📚 文档列表
|
||||
|
||||
### 1. **commission-search-result.md** (237行)
|
||||
**内容**: 差价佣金计算和分配逻辑的完整搜索结果
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 差价佣金的计算方式(公式、流程、示例)
|
||||
- ✅ 差价佣金的发放条件(触发条件、发放流程、入账步骤)
|
||||
- ✅ 差价佣金与订单状态的关系(状态定义、转换关系、关键字段)
|
||||
- ✅ 关键代码位置总结(表格形式)
|
||||
- ✅ 相关常量定义
|
||||
|
||||
**适合场景**: 需要快速了解差价佣金的完整逻辑
|
||||
|
||||
**快速导航**:
|
||||
- 差价佣金计算公式 → 第一部分 1.1
|
||||
- 计算流程详解 → 第一部分 1.2
|
||||
- 触发条件 → 第二部分 2.1
|
||||
- 发放流程 → 第二部分 2.2
|
||||
- 佣金入账 → 第二部分 2.3
|
||||
|
||||
---
|
||||
|
||||
### 2. **commission-flow-diagram.md** (319行)
|
||||
**内容**: 差价佣金计算的可视化流程图
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 订单支付到佣金入账的完整流程(ASCII流程图)
|
||||
- ✅ 成本价差佣金计算详细流程(分步骤流程图)
|
||||
- ✅ 佣金入账流程(5个步骤)
|
||||
- ✅ 订单状态转换图
|
||||
- ✅ 佣金记录状态转换图
|
||||
- ✅ 代理链佣金分配示例(实际案例)
|
||||
|
||||
**适合场景**: 需要理解整个流程的全貌,或向他人解释流程
|
||||
|
||||
**快速导航**:
|
||||
- 完整流程 → 第一部分
|
||||
- 计算细节 → 第二部分
|
||||
- 入账步骤 → 第三部分
|
||||
- 状态转换 → 第四、五部分
|
||||
- 实际案例 → 第六部分
|
||||
|
||||
---
|
||||
|
||||
### 3. **commission-quick-reference.md** (283行)
|
||||
**内容**: 差价佣金的快速参考指南
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 关键文件位置表(8个关键功能)
|
||||
- ✅ 关键常量速查(任务类型、佣金来源、状态常量)
|
||||
- ✅ 关键数据库表(5个核心表)
|
||||
- ✅ 常见问题快速查询(10个Q&A)
|
||||
- ✅ 调试技巧(6个SQL查询示例)
|
||||
- ✅ 性能优化建议(3个优化方向)
|
||||
- ✅ 常见错误排查(3个常见错误)
|
||||
|
||||
**适合场景**: 开发过程中快速查询信息,或调试问题
|
||||
|
||||
**快速导航**:
|
||||
- 找代码位置 → 快速查询表 1
|
||||
- 找常量值 → 快速查询表 2
|
||||
- 找数据库表 → 快速查询表 3
|
||||
- 常见问题 → 常见问题快速查询
|
||||
- 调试SQL → 调试技巧
|
||||
- 性能问题 → 性能优化建议
|
||||
- 错误处理 → 常见错误排查
|
||||
|
||||
---
|
||||
|
||||
### 4. **commission-package-model.md** (351行)
|
||||
**内容**: 套餐与佣金业务模型(原有文档)
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 核心概念(两种佣金类型、实体关系)
|
||||
- ✅ 套餐模型详解
|
||||
- ✅ 差价佣金规则(计算规则、关键区分)
|
||||
- ✅ 一次性佣金规则(触发条件、链式分配、流程)
|
||||
- ✅ 梯度佣金规则
|
||||
- ✅ 约束规则(6个约束)
|
||||
- ✅ 操作流程(理想的线性流程)
|
||||
|
||||
**适合场景**: 需要理解完整的业务规则和约束
|
||||
|
||||
**快速导航**:
|
||||
- 两种佣金类型 → 第一部分 1.1
|
||||
- 差价佣金规则 → 第三部分
|
||||
- 一次性佣金规则 → 第四部分
|
||||
- 约束规则 → 第六部分
|
||||
|
||||
---
|
||||
|
||||
## 🎯 使用指南
|
||||
|
||||
### 场景1: 我是新开发者,想快速了解差价佣金
|
||||
|
||||
**推荐阅读顺序**:
|
||||
1. 先读 `commission-flow-diagram.md` 的第一部分(了解整体流程)
|
||||
2. 再读 `commission-search-result.md` 的第一部分(理解计算方式)
|
||||
3. 最后读 `commission-quick-reference.md` 的常见问题(掌握细节)
|
||||
|
||||
**预计时间**: 30分钟
|
||||
|
||||
---
|
||||
|
||||
### 场景2: 我需要修改佣金计算逻辑
|
||||
|
||||
**推荐阅读顺序**:
|
||||
1. 先读 `commission-search-result.md` 的第一部分(理解当前逻辑)
|
||||
2. 查看 `commission-quick-reference.md` 的关键文件位置(定位代码)
|
||||
3. 查看 `commission-flow-diagram.md` 的第二部分(理解计算细节)
|
||||
4. 打开代码文件进行修改
|
||||
|
||||
**关键文件**: `internal/service/commission_calculation/service.go:121-225`
|
||||
|
||||
---
|
||||
|
||||
### 场景3: 我需要调试佣金计算问题
|
||||
|
||||
**推荐阅读顺序**:
|
||||
1. 先读 `commission-quick-reference.md` 的调试技巧(获取SQL查询)
|
||||
2. 执行SQL查询获取数据
|
||||
3. 对比 `commission-flow-diagram.md` 的第六部分(验证计算结果)
|
||||
4. 查看 `commission-quick-reference.md` 的常见错误排查(定位问题)
|
||||
|
||||
**关键SQL**: 见 `commission-quick-reference.md` 的调试技巧部分
|
||||
|
||||
---
|
||||
|
||||
### 场景4: 我需要向产品经理解释佣金逻辑
|
||||
|
||||
**推荐阅读顺序**:
|
||||
1. 先读 `commission-package-model.md` 的第三部分(业务规则)
|
||||
2. 使用 `commission-flow-diagram.md` 的第六部分(实际案例)
|
||||
3. 使用 `commission-flow-diagram.md` 的流程图(可视化展示)
|
||||
|
||||
**关键资源**: `commission-flow-diagram.md` 的第六部分(代理链佣金分配示例)
|
||||
|
||||
---
|
||||
|
||||
### 场景5: 我需要验证佣金计算的正确性
|
||||
|
||||
**推荐阅读顺序**:
|
||||
1. 先读 `commission-quick-reference.md` 的Q10(验证方法)
|
||||
2. 执行SQL查询获取数据
|
||||
3. 按照验证步骤进行检查
|
||||
4. 如有问题,查看常见错误排查
|
||||
|
||||
**关键内容**: `commission-quick-reference.md` 的Q10
|
||||
|
||||
---
|
||||
|
||||
## 📊 文档对比表
|
||||
|
||||
| 文档 | 长度 | 类型 | 适合场景 | 重点 |
|
||||
|------|------|------|---------|------|
|
||||
| commission-search-result.md | 237行 | 参考 | 快速了解逻辑 | 代码位置、计算方式 |
|
||||
| commission-flow-diagram.md | 319行 | 可视化 | 理解流程 | 流程图、状态转换 |
|
||||
| commission-quick-reference.md | 283行 | 工具 | 开发调试 | 常见问题、SQL查询 |
|
||||
| commission-package-model.md | 351行 | 规范 | 业务理解 | 业务规则、约束 |
|
||||
|
||||
---
|
||||
|
||||
## 🔗 关键代码位置速查
|
||||
|
||||
| 功能 | 文件 | 行号 | 文档位置 |
|
||||
|------|------|------|---------|
|
||||
| 差价佣金计算 | `internal/service/commission_calculation/service.go` | 121-225 | search-result 1.2 |
|
||||
| 佣金入账 | `internal/service/commission_calculation/service.go` | 641-687 | search-result 2.3 |
|
||||
| 佣金计算触发 | `internal/service/order/service.go` | 2132-2150 | search-result 2.1 |
|
||||
| 订单支付完成 | `internal/service/order/service.go` | 1431-1623 | search-result 2.1 |
|
||||
| 异步任务处理 | `internal/task/commission_calculation.go` | 40-62 | search-result 2.2 |
|
||||
|
||||
---
|
||||
|
||||
## 💡 常见问题速查
|
||||
|
||||
| 问题 | 答案位置 |
|
||||
|------|---------|
|
||||
| 差价佣金什么时候计算? | quick-reference Q1 |
|
||||
| 差价佣金的计算公式是什么? | quick-reference Q2 / search-result 1.1 |
|
||||
| 如何查询某个订单的佣金记录? | quick-reference Q3 |
|
||||
| 佣金什么时候入账? | quick-reference Q4 |
|
||||
| 链路断裂是什么意思? | quick-reference Q5 |
|
||||
| 如何追踪佣金计算过程? | quick-reference Q6 |
|
||||
| 代理钱包余额如何更新? | quick-reference Q7 |
|
||||
| 如何处理佣金计算失败? | quick-reference Q8 |
|
||||
| 一个订单产生多少条佣金记录? | quick-reference Q9 |
|
||||
| 如何验证佣金计算的正确性? | quick-reference Q10 |
|
||||
|
||||
---
|
||||
|
||||
## 📝 文档维护
|
||||
|
||||
### 最后更新时间
|
||||
- commission-search-result.md: 2025-04-11
|
||||
- commission-flow-diagram.md: 2025-04-11
|
||||
- commission-quick-reference.md: 2025-04-11
|
||||
- commission-package-model.md: 2025-02-03
|
||||
|
||||
### 更新日志
|
||||
- 2025-04-11: 新增三份文档(search-result, flow-diagram, quick-reference)
|
||||
- 2025-02-03: 原有 commission-package-model.md
|
||||
|
||||
### 如何贡献
|
||||
如果发现文档有误或需要补充,请:
|
||||
1. 提交 Issue 描述问题
|
||||
2. 或直接提交 PR 修改文档
|
||||
3. 确保修改后的文档保持一致性
|
||||
|
||||
---
|
||||
|
||||
## 🚀 快速开始
|
||||
|
||||
**第一次接触差价佣金?**
|
||||
|
||||
1. 花5分钟看 `commission-flow-diagram.md` 的第一部分
|
||||
2. 花10分钟看 `commission-search-result.md` 的第一部分
|
||||
3. 需要时查阅 `commission-quick-reference.md`
|
||||
|
||||
**预计总时间**: 15分钟快速入门
|
||||
|
||||
---
|
||||
|
||||
## 📞 获取帮助
|
||||
|
||||
- **代码问题**: 查看 `commission-quick-reference.md` 的常见错误排查
|
||||
- **业务问题**: 查看 `commission-package-model.md` 的约束规则
|
||||
- **流程问题**: 查看 `commission-flow-diagram.md` 的流程图
|
||||
- **其他问题**: 查看 `commission-quick-reference.md` 的常见问题
|
||||
|
||||
250
docs/ORDER_STATUS_INDEX.md
Normal file
250
docs/ORDER_STATUS_INDEX.md
Normal file
@@ -0,0 +1,250 @@
|
||||
# 订单状态与佣金系统文档索引
|
||||
|
||||
本索引汇总了关于订单状态、冻结状态和差价佣金的所有文档和代码位置。
|
||||
|
||||
## 📚 文档列表
|
||||
|
||||
### 1. [order_status_commission_analysis.md](order_status_commission_analysis.md)
|
||||
**完整的系统分析报告** - 适合深入理解系统设计
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 订单状态定义(支付状态、佣金状态)
|
||||
- ✅ 订单状态流转逻辑(3种支付方式)
|
||||
- ✅ 订单超时自动取消机制
|
||||
- ✅ 佣金系统与订单的关系
|
||||
- ✅ 钱包冻结与提现流程(3阶段)
|
||||
- ✅ 关键数据模型说明
|
||||
- ✅ 完整流程图
|
||||
- ✅ 业务规则总结
|
||||
- ✅ 文件索引表
|
||||
|
||||
**适用场景**:
|
||||
- 需要全面理解系统设计
|
||||
- 进行系统架构评审
|
||||
- 编写相关功能文档
|
||||
|
||||
---
|
||||
|
||||
### 2. [order_status_quick_reference.md](order_status_quick_reference.md)
|
||||
**快速参考指南** - 适合日常开发查询
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 订单支付状态速查表
|
||||
- ✅ 订单佣金状态速查表
|
||||
- ✅ 订单创建流程速查
|
||||
- ✅ 钱包冻结状态速查表
|
||||
- ✅ 提现流程速查(3阶段)
|
||||
- ✅ 佣金类型速查
|
||||
- ✅ 关键代码位置速查
|
||||
- ✅ 常用常量速查
|
||||
- ✅ 常见问题解答
|
||||
- ✅ 数据库查询示例
|
||||
- ✅ 业务规则速查
|
||||
|
||||
**适用场景**:
|
||||
- 快速查询状态值
|
||||
- 查找代码位置
|
||||
- 解答常见问题
|
||||
- 编写 SQL 查询
|
||||
|
||||
---
|
||||
|
||||
### 3. [order_status_search_summary.md](order_status_search_summary.md)
|
||||
**搜索结果总结** - 适合了解核心发现
|
||||
|
||||
**包含内容**:
|
||||
- ✅ 搜索范围说明
|
||||
- ✅ 5个核心发现
|
||||
- ✅ 关键代码位置索引
|
||||
- ✅ 重要业务规则
|
||||
- ✅ 数据流向图
|
||||
- ✅ 生成的文档说明
|
||||
- ✅ 关键发现总结
|
||||
- ✅ 注意事项
|
||||
- ✅ 最佳实践
|
||||
|
||||
**适用场景**:
|
||||
- 快速了解系统概况
|
||||
- 查找关键代码位置
|
||||
- 了解业务规则
|
||||
- 学习最佳实践
|
||||
|
||||
---
|
||||
|
||||
## 🔍 核心概念速查
|
||||
|
||||
### 订单状态
|
||||
| 状态 | 值 | 说明 |
|
||||
|------|-----|------|
|
||||
| 待支付 | 1 | 微信/支付宝支付时的初始状态 |
|
||||
| 已支付 | 2 | 线下/钱包支付或支付回调后的状态 |
|
||||
| 已取消 | 3 | 待支付订单超时30分钟后的状态 |
|
||||
| 已退款 | 4 | 退款操作后的状态 |
|
||||
|
||||
### 佣金状态
|
||||
| 状态 | 值 | 说明 |
|
||||
|------|-----|------|
|
||||
| 待计算 | 1 | 订单创建时的初始状态 |
|
||||
| 已计算 | 2 | 佣金计算完成后的状态 |
|
||||
|
||||
### 钱包冻结
|
||||
| 字段 | 说明 |
|
||||
|------|------|
|
||||
| balance | 总余额 |
|
||||
| frozen_balance | 冻结余额(用于提现) |
|
||||
| 可用余额 | balance - frozen_balance |
|
||||
|
||||
---
|
||||
|
||||
## 📍 关键代码位置
|
||||
|
||||
### 订单相关
|
||||
```
|
||||
internal/model/order.go
|
||||
├─ 第 98-104 行:支付状态常量
|
||||
├─ 第 106-110 行:佣金状态常量
|
||||
└─ 第 9-138 行:订单模型定义
|
||||
|
||||
internal/service/order/service.go
|
||||
├─ 第 114-354 行:CreateLegacy(已废弃)
|
||||
├─ 第 359-674 行:CreateAdminOrder(后台订单创建)
|
||||
├─ 第 679-928 行:CreateH5Order(H5订单创建)
|
||||
└─ 第 1314-1385 行:订单超时自动取消
|
||||
```
|
||||
|
||||
### 佣金相关
|
||||
```
|
||||
internal/service/commission_calculation/service.go
|
||||
├─ 第 74-119 行:佣金计算主逻辑
|
||||
└─ 第 121-230 行:成本价差佣金计算
|
||||
|
||||
internal/model/commission.go
|
||||
└─ 第 9-46 行:佣金记录模型
|
||||
```
|
||||
|
||||
### 提现相关
|
||||
```
|
||||
internal/service/shop_commission/service.go
|
||||
└─ 第 517-649 行:代理发起提现申请
|
||||
|
||||
internal/service/commission_withdrawal/service.go
|
||||
├─ 第 145-256 行:平台审核通过
|
||||
└─ 第 258-310 行:平台审核拒绝
|
||||
```
|
||||
|
||||
### 钱包相关
|
||||
```
|
||||
internal/model/agent_wallet.go
|
||||
├─ 第 9-30 行:代理钱包模型
|
||||
└─ 第 37-94 行:钱包交易记录模型
|
||||
|
||||
pkg/constants/wallet.go
|
||||
├─ 第 17-22 行:钱包状态常量
|
||||
├─ 第 83-91 行:交易状态常量
|
||||
└─ 第 1-234 行:所有钱包相关常量
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 常见任务指南
|
||||
|
||||
### 任务 1:查询订单状态
|
||||
**文档**:order_status_quick_reference.md - 订单支付状态速查表
|
||||
**代码**:internal/model/order.go:98-104
|
||||
|
||||
### 任务 2:理解佣金计算
|
||||
**文档**:order_status_commission_analysis.md - 第三章
|
||||
**代码**:internal/service/commission_calculation/service.go:74-230
|
||||
|
||||
### 任务 3:实现提现功能
|
||||
**文档**:order_status_commission_analysis.md - 第四章
|
||||
**代码**:
|
||||
- 发起申请:internal/service/shop_commission/service.go:517-649
|
||||
- 审核通过:internal/service/commission_withdrawal/service.go:145-256
|
||||
- 审核拒绝:internal/service/commission_withdrawal/service.go:258-310
|
||||
|
||||
### 任务 4:查询可提现金额
|
||||
**文档**:order_status_quick_reference.md - 数据库查询速查
|
||||
**SQL**:
|
||||
```sql
|
||||
SELECT balance - frozen_balance as available_balance
|
||||
FROM tb_agent_wallet
|
||||
WHERE shop_id = ? AND wallet_type = 'commission';
|
||||
```
|
||||
|
||||
### 任务 5:处理订单超时
|
||||
**文档**:order_status_commission_analysis.md - 第二章
|
||||
**代码**:internal/service/order/service.go:1314-1385
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ 重要注意事项
|
||||
|
||||
1. **订单没有冻结状态**
|
||||
- 冻结状态存在于代理钱包,不在订单
|
||||
- 订单只有支付状态和佣金状态
|
||||
|
||||
2. **订单超时不计算佣金**
|
||||
- 取消的订单佣金状态保持为"待计算"
|
||||
- 不会入队佣金计算任务
|
||||
|
||||
3. **代购订单不计算一次性佣金**
|
||||
- 一次性佣金仅对非代购订单触发
|
||||
- 仅在首次购买时触发
|
||||
|
||||
4. **提现流程中的冻结机制**
|
||||
- 提现申请时冻结余额
|
||||
- 审核通过时从冻结余额直接扣款
|
||||
- 审核拒绝时解冻余额
|
||||
|
||||
---
|
||||
|
||||
## 📊 文档统计
|
||||
|
||||
| 文档 | 大小 | 章节数 | 代码位置数 |
|
||||
|------|------|--------|-----------|
|
||||
| order_status_commission_analysis.md | 14K | 9 | 20+ |
|
||||
| order_status_quick_reference.md | 6.0K | 12 | 15+ |
|
||||
| order_status_search_summary.md | 6.1K | 8 | 10+ |
|
||||
|
||||
**总计**:26.1K,29个章节,45+个代码位置
|
||||
|
||||
---
|
||||
|
||||
## 🚀 快速开始
|
||||
|
||||
### 第一次接触系统?
|
||||
1. 阅读 order_status_search_summary.md(5分钟)
|
||||
2. 查看 order_status_commission_analysis.md 的流程图(10分钟)
|
||||
3. 收藏 order_status_quick_reference.md(备用)
|
||||
|
||||
### 需要快速查询?
|
||||
1. 打开 order_status_quick_reference.md
|
||||
2. 使用速查表或常见问题部分
|
||||
3. 参考代码位置索引
|
||||
|
||||
### 需要深入理解?
|
||||
1. 阅读 order_status_commission_analysis.md 的完整内容
|
||||
2. 对照代码位置查看源代码
|
||||
3. 参考业务规则总结
|
||||
|
||||
---
|
||||
|
||||
## 📞 相关资源
|
||||
|
||||
### 相关文档
|
||||
- [套餐与佣金业务模型](../commission-package-model.md)
|
||||
- [分佣逻辑验证指引](../优化说明/分佣逻辑正确与否验证.md)
|
||||
|
||||
### 相关代码
|
||||
- 订单服务:`internal/service/order/`
|
||||
- 佣金服务:`internal/service/commission_calculation/`
|
||||
- 提现服务:`internal/service/commission_withdrawal/`
|
||||
- 钱包服务:`internal/service/shop_commission/`
|
||||
|
||||
---
|
||||
|
||||
**最后更新**:2024年4月11日
|
||||
**文档版本**:1.0
|
||||
**维护者**:开发团队
|
||||
|
||||
244
docs/PACKAGE_DOCS_INDEX.md
Normal file
244
docs/PACKAGE_DOCS_INDEX.md
Normal file
@@ -0,0 +1,244 @@
|
||||
# 套餐接口文档索引
|
||||
|
||||
本目录包含套餐(Package/PackageSeries)相关接口的完整代码结构分析文档。
|
||||
|
||||
## 📚 文档清单
|
||||
|
||||
### 1. 📋 [完整结构分析](./package_structure_summary.md)
|
||||
**用途**:全面了解套餐接口的代码结构
|
||||
|
||||
**包含内容**:
|
||||
- Model 层文件位置和结构
|
||||
- DTO 层请求/响应定义
|
||||
- Handler 层方法列表
|
||||
- Service 层业务逻辑
|
||||
- Store 层数据访问
|
||||
- API 路由注册
|
||||
- 关键字段详解(duration_days)
|
||||
- 业务逻辑关键点
|
||||
- 数据库表结构
|
||||
- 完整请求/响应示例
|
||||
|
||||
**适合场景**:
|
||||
- 需要全面了解套餐接口架构
|
||||
- 查看具体的代码位置和行号
|
||||
- 理解业务逻辑和校验规则
|
||||
|
||||
---
|
||||
|
||||
### 2. 🎯 [快速导航指南](./package_quick_navigation.md)
|
||||
**用途**:快速定位需要的代码
|
||||
|
||||
**包含内容**:
|
||||
- 按功能快速查找表
|
||||
- 按字段快速查找表
|
||||
- 按 API 端点快速查找表
|
||||
- 关键代码片段
|
||||
- 数据流向图
|
||||
- 常见操作指南
|
||||
- 相关模块链接
|
||||
|
||||
**适合场景**:
|
||||
- 需要快速找到某个字段或方法
|
||||
- 想了解数据流向
|
||||
- 需要修改或扩展功能
|
||||
|
||||
---
|
||||
|
||||
### 3. 🏗️ [架构详细图](./package_architecture_diagram.md)
|
||||
**用途**:可视化理解系统架构
|
||||
|
||||
**包含内容**:
|
||||
- 整体架构流程图
|
||||
- 分层详细结构(Handler/Service/Store)
|
||||
- 数据模型关系图
|
||||
- 请求流程示例
|
||||
- 代理用户查询流程
|
||||
- 字段验证流程
|
||||
|
||||
**适合场景**:
|
||||
- 需要理解系统整体架构
|
||||
- 想了解数据流向和处理过程
|
||||
- 需要设计新功能时参考
|
||||
|
||||
---
|
||||
|
||||
## 🔍 快速查找
|
||||
|
||||
### 按需求查找
|
||||
|
||||
| 需求 | 文档 | 位置 |
|
||||
|------|------|------|
|
||||
| 查看套餐数据模型 | 完整结构分析 | 第 1 节 |
|
||||
| 查看 API 请求/响应结构 | 完整结构分析 | 第 2 节 |
|
||||
| 查看 HTTP 处理器 | 完整结构分析 | 第 3 节 |
|
||||
| 查看业务逻辑 | 完整结构分析 | 第 4 节 |
|
||||
| 查看数据访问 | 完整结构分析 | 第 5 节 |
|
||||
| 快速定位代码 | 快速导航指南 | 第 1-2 节 |
|
||||
| 理解数据流向 | 快速导航指南 | 第 3 节 |
|
||||
| 了解系统架构 | 架构详细图 | 第 1-2 节 |
|
||||
| 查看请求流程 | 架构详细图 | 第 4-5 节 |
|
||||
|
||||
### 按文件查找
|
||||
|
||||
| 文件 | 说明 | 文档 |
|
||||
|------|------|------|
|
||||
| `internal/model/package.go` | 数据模型 | 完整结构分析 1.1 |
|
||||
| `internal/model/dto/package_dto.go` | DTO 定义 | 完整结构分析 1.2 |
|
||||
| `internal/handler/admin/package.go` | HTTP 处理 | 完整结构分析 1.3 |
|
||||
| `internal/service/package/service.go` | 业务逻辑 | 完整结构分析 1.4 |
|
||||
| `internal/store/postgres/package_store.go` | 数据访问 | 完整结构分析 1.5 |
|
||||
| `internal/routes/package.go` | 路由注册 | 完整结构分析 2.2 |
|
||||
| `internal/routes/admin.go` | 路由入口 | 完整结构分析 2.1 |
|
||||
|
||||
### 按字段查找
|
||||
|
||||
| 字段 | Model 位置 | DTO 位置 | 文档 |
|
||||
|------|-----------|---------|------|
|
||||
| `duration_days` | package.go:46 | package_dto.go:96 | 完整结构分析 3.1 |
|
||||
| `calendar_type` | package.go:45 | package_dto.go:95 | 完整结构分析 3.1 |
|
||||
| `duration_months` | package.go:37 | package_dto.go:79 | 完整结构分析 3.1 |
|
||||
| `real_data_mb` | package.go:38 | package_dto.go:80 | 完整结构分析 3.1 |
|
||||
| `virtual_data_mb` | package.go:39 | package_dto.go:81 | 完整结构分析 3.1 |
|
||||
|
||||
---
|
||||
|
||||
## 🔑 关键信息速查
|
||||
|
||||
### duration_days 字段
|
||||
|
||||
**定义位置**:
|
||||
- Model: `internal/model/package.go:46`
|
||||
- DTO: `internal/model/dto/package_dto.go:96`
|
||||
|
||||
**用途**:
|
||||
- 当 `calendar_type = "by_day"` 时必填
|
||||
- 用于按天计算套餐有效期
|
||||
|
||||
**验证规则**:
|
||||
- 范围:1-3650 天
|
||||
- 当 `calendar_type = "by_day"` 时必须提供
|
||||
|
||||
**相关校验**:
|
||||
- Service 层校验:`internal/service/package/service.go:65-80`
|
||||
|
||||
---
|
||||
|
||||
### API 端点总览
|
||||
|
||||
| 方法 | 路径 | 处理器 | 说明 |
|
||||
|------|------|--------|------|
|
||||
| GET | `/packages` | `List()` | 套餐列表 |
|
||||
| POST | `/packages` | `Create()` | 创建套餐 |
|
||||
| GET | `/packages/:id` | `Get()` | 获取详情 |
|
||||
| PUT | `/packages/:id` | `Update()` | 更新套餐 |
|
||||
| DELETE | `/packages/:id` | `Delete()` | 删除套餐 |
|
||||
| PATCH | `/packages/:id/status` | `UpdateStatus()` | 更新状态 |
|
||||
| PATCH | `/packages/:id/shelf` | `UpdateShelfStatus()` | 更新上架状态 |
|
||||
| PATCH | `/packages/:id/retail-price` | `UpdateRetailPrice()` | 更新零售价 |
|
||||
|
||||
**路由注册**:
|
||||
- 文件:`internal/routes/package.go:11-78`
|
||||
- 入口:`internal/routes/admin.go:71-78`
|
||||
|
||||
---
|
||||
|
||||
### 关键业务逻辑
|
||||
|
||||
#### 1. 虚流量配置校验
|
||||
**位置**:`internal/service/package/service.go:51-63`
|
||||
|
||||
规则:
|
||||
- 启用虚流量时,虚流量额度必须 > 0
|
||||
- 虚流量额度不能大于真流量额度
|
||||
|
||||
#### 2. 套餐周期类型校验
|
||||
**位置**:`internal/service/package/service.go:65-80`
|
||||
|
||||
规则:
|
||||
- `natural_month`:必须提供 `duration_months`
|
||||
- `by_day`:必须提供 `duration_days`
|
||||
|
||||
#### 3. 代理用户套餐过滤
|
||||
**位置**:`internal/store/postgres/package_store.go:57-66`
|
||||
|
||||
规则:
|
||||
- 代理用户只能看到已分配的套餐
|
||||
- 通过 INNER JOIN `tb_shop_package_allocation` 实现
|
||||
|
||||
---
|
||||
|
||||
## 📊 数据库表
|
||||
|
||||
### 主要表
|
||||
|
||||
| 表名 | 说明 | 文档 |
|
||||
|------|------|------|
|
||||
| `tb_package` | 套餐表 | 完整结构分析 6.1 |
|
||||
| `tb_package_series` | 套餐系列表 | 完整结构分析 6.2 |
|
||||
| `tb_package_usage` | 套餐使用表 | 架构详细图 3 |
|
||||
| `tb_package_usage_daily_record` | 日记录表 | 架构详细图 3 |
|
||||
| `tb_shop_package_allocation` | 套餐分配表 | 架构详细图 3 |
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ 常见操作
|
||||
|
||||
### 添加新的套餐字段
|
||||
|
||||
1. **Model 层**:修改 `internal/model/package.go` 的 `Package` 结构体
|
||||
2. **DTO 层**:修改 `internal/model/dto/package_dto.go` 的相关 Request/Response
|
||||
3. **Service 层**:修改 `internal/service/package/service.go` 的业务逻辑
|
||||
4. **Store 层**:修改 `internal/store/postgres/package_store.go` 的查询条件
|
||||
5. **数据库**:添加数据库迁移
|
||||
|
||||
详见:快速导航指南 第 4 节
|
||||
|
||||
### 修改套餐 API 响应
|
||||
|
||||
1. 修改 `PackageResponse` 结构体(`package_dto.go:71-99`)
|
||||
2. 修改 Service 的转换逻辑
|
||||
3. 测试 API 端点
|
||||
|
||||
详见:快速导航指南 第 4 节
|
||||
|
||||
### 添加新的套餐 API 端点
|
||||
|
||||
1. 在 `PackageHandler` 中添加方法
|
||||
2. 在 `PackageService` 中添加业务逻辑
|
||||
3. 在 `registerPackageRoutes()` 中注册路由
|
||||
|
||||
详见:快速导航指南 第 4 节
|
||||
|
||||
---
|
||||
|
||||
## 📝 相关文档
|
||||
|
||||
- **套餐系统升级**:`docs/package-system-upgrade/`
|
||||
- **套餐与佣金业务模型**:`docs/commission-package-model.md`
|
||||
- **API 文档生成规范**:`docs/api-documentation-guide.md`
|
||||
|
||||
---
|
||||
|
||||
## 🔗 相关模块
|
||||
|
||||
| 模块 | 说明 | 文件 |
|
||||
|------|------|------|
|
||||
| **PackageSeries** | 套餐系列管理 | `internal/routes/package_series.go` |
|
||||
| **PackageUsage** | 套餐使用记录 | `internal/routes/package_usage.go` |
|
||||
| **ShopPackageAllocation** | 套餐分配给代理 | `internal/store/postgres/shop_package_allocation_store.go` |
|
||||
| **ShopSeriesAllocation** | 系列分配给代理 | `internal/store/postgres/shop_series_allocation_store.go` |
|
||||
|
||||
---
|
||||
|
||||
## 💡 使用建议
|
||||
|
||||
1. **首次了解**:先读 [架构详细图](./package_architecture_diagram.md),理解整体流程
|
||||
2. **深入学习**:再读 [完整结构分析](./package_structure_summary.md),了解具体实现
|
||||
3. **快速查找**:使用 [快速导航指南](./package_quick_navigation.md),定位具体代码
|
||||
4. **修改代码**:参考 [快速导航指南](./package_quick_navigation.md) 的常见操作部分
|
||||
|
||||
---
|
||||
|
||||
**最后更新**:2025-04-10
|
||||
**文档版本**:1.0
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user