Merge pull request 'feat(user): 用户系统重做——人机验证、签到、主题色购买与退款' (#39) from feat/user-system into main
Reviewed-on: #39
This commit was merged in pull request #39.
This commit is contained in:
commit
185a8905f9
13 files changed
+1869
-506
No files matched your search
+26
-2
@@ -6,9 +6,11 @@
|
||||
| --- | --- | --- |
|
||||
| `nightly-prerelease.yml` | 每天 21:00(Asia/Shanghai),或手动 | 编译 macOS + Windows(amd64/arm64),发布 **`nightly`** 预发布 |
|
||||
| `build-bot.yml` | Issue / PR 评论里 `@build-bot build <目标>` | 只编译指定平台,发布 **`ip-prerelease`** 预发布 |
|
||||
| `build-release.yml` | Issue / PR 评论里 `@build-release-bot build <版本号>` | 编译三平台,发布 **tag = 版本号** 的正式 Release |
|
||||
| `pr-review.yml` | 向 main 提 PR(新建 / 有新提交 / 重新打开) | 检查能否编译、是否有错、是否冲突、是否落后 main |
|
||||
|
||||
两个预发布用**不同的 tag**,互不覆盖:夜间构建发 `nightly`,手动触发的发 `ip-prerelease`。
|
||||
预发布用**不同的 tag**,互不覆盖:夜间构建发 `nightly`,`@build-bot` 发 `ip-prerelease`;
|
||||
`@build-release-bot` 发的是正式版本(tag 就是版本号,会更新 latest)。
|
||||
|
||||
## 每夜构建
|
||||
|
||||
@@ -59,5 +61,27 @@
|
||||
- `Settings → Actions → General → Workflow permissions` 给 **Read and write**,
|
||||
否则 `gh release` / 评论接口会 403(工作流里已声明 `permissions:`,但组织策略可能覆盖)。
|
||||
- Secrets 不需要额外配置,统一用内置的 `GITHUB_TOKEN`。
|
||||
- macOS 产物是 **未签名** 的(`GC_NO_CODESIGN=1`)。下载后首次打开需右键 →「打开」,
|
||||
- macOS 产物是 **ad-hoc 签名**(无开发者证书)。下载后首次打开需右键 →「打开」,
|
||||
或在「系统设置 → 隐私与安全性」里放行。
|
||||
|
||||
## build-release 用法
|
||||
|
||||
在 Issue 或 PR 里评论:
|
||||
|
||||
```
|
||||
@build-release-bot build 1.1.3
|
||||
```
|
||||
|
||||
规则:
|
||||
|
||||
- 版本号必须是 `主.次.修订`(如 `1.1.3`),其它写法会被忽略
|
||||
- tag 已存在时不会触发,会回帖说明「请换一个版本号」——同一个 tag 发两次会让客户端拿到两份不同内容
|
||||
- 只有 `OWNER` / `MEMBER` / `COLLABORATOR` 能触发
|
||||
- 编 macOS + Windows(amd64/arm64),**两个平台都成功**才发 Release,否则只回帖失败原因
|
||||
- Release 附带 `SHA256SUMS.txt`
|
||||
- **不会**改动仓库里的 `version.json`:它由 GC-SAVEDOG 签名,CI 没有签名私钥。清单更新请在本地跑 `./build.sh stamp`
|
||||
|
||||
## macOS runner
|
||||
|
||||
统一用 `macos-latest`。`macos-14` 在本账号会被判为 `macos-14-arm64-us-default` 不受支持,
|
||||
job 在启动前就变成 cancelled。runner 自带多个版本的 Xcode 和 CocoaPods,不需要额外安装。
|
||||
@@ -79,17 +79,54 @@ jobs:
|
||||
echo "is_pr=$IS_PR" >> "$GITHUB_OUTPUT"
|
||||
|
||||
if [ "$IS_PR" = "true" ]; then
|
||||
REF=$(gh api "repos/${{ github.repository }}/pulls/${ISSUE_NUMBER}" --jq '.head.sha')
|
||||
# 只有「还开着」的 PR 才编它的 head;已合并/已关闭的 PR 编默认分支,
|
||||
# 否则会编到一份过期的代码。
|
||||
PR_STATE=$(gh api "repos/${{ github.repository }}/pulls/${ISSUE_NUMBER}" --jq '.state')
|
||||
if [ "$PR_STATE" = "open" ]; then
|
||||
REF=$(gh api "repos/${{ github.repository }}/pulls/${ISSUE_NUMBER}" --jq '.head.sha')
|
||||
else
|
||||
REF="${{ github.event.repository.default_branch }}"
|
||||
echo "PR 已 $PR_STATE,改为编译默认分支"
|
||||
fi
|
||||
else
|
||||
REF="${{ github.event.repository.default_branch }}"
|
||||
fi
|
||||
echo "ref=$REF" >> "$GITHUB_OUTPUT"
|
||||
echo "目标=$TARGET 提交=$REF 是否PR=$IS_PR"
|
||||
|
||||
- name: 回复「开始编译」
|
||||
if: steps.parse.outputs.ok == 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
ISSUE: ${{ github.event.issue.number }}
|
||||
TARGET: ${{ steps.parse.outputs.target }}
|
||||
REF: ${{ steps.parse.outputs.ref }}
|
||||
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
run: |
|
||||
set -e
|
||||
case "$TARGET" in
|
||||
mac) PLATFORMS="macOS" ;;
|
||||
win-amd) PLATFORMS="Windows amd64" ;;
|
||||
win-arm) PLATFORMS="Windows arm64" ;;
|
||||
*) PLATFORMS="macOS + Windows amd64 + Windows arm64" ;;
|
||||
esac
|
||||
|
||||
cat > ack.md <<EOF
|
||||
🔨 **开始编译**:${PLATFORMS}
|
||||
|
||||
- 来源提交:\`${REF:0:7}\`
|
||||
- 目标:\`${TARGET}\`
|
||||
- 实时日志:${RUN_URL}
|
||||
|
||||
编译完成后会在这里回复结果。
|
||||
EOF
|
||||
|
||||
gh issue comment "$ISSUE" --body-file ack.md
|
||||
|
||||
build-mac:
|
||||
needs: prepare
|
||||
if: needs.prepare.outputs.ok == 'true' && (needs.prepare.outputs.target == 'mac' || needs.prepare.outputs.target == 'all')
|
||||
runs-on: macos-14
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@@ -107,7 +144,6 @@ jobs:
|
||||
|
||||
- name: 编译 macOS
|
||||
env:
|
||||
GC_NO_CODESIGN: '1'
|
||||
GC_NO_PROGRESS: '1'
|
||||
run: ./build.sh build --targets=mac
|
||||
|
||||
@@ -223,18 +259,54 @@ jobs:
|
||||
|
||||
echo "https://github.com/${{ github.repository }}/releases/tag/$TAG" >> "$GITHUB_STEP_SUMMARY"
|
||||
|
||||
- name: 回帖
|
||||
if: always()
|
||||
# 结果回帖独立成一个 job:编译失败 / 发布失败也要有回音,
|
||||
# 不能因为 publish 被跳过就静默。
|
||||
report:
|
||||
needs: [prepare, build-mac, build-win, publish]
|
||||
if: always() && needs.prepare.outputs.ok == 'true'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: 回帖结果
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
TARGET: ${{ needs.prepare.outputs.target }}
|
||||
# 本 job 不 checkout(省时间),gh 需要显式指定仓库
|
||||
GH_REPO: ${{ github.repository }}
|
||||
ISSUE: ${{ github.event.issue.number }}
|
||||
STATE: ${{ steps.publish_step.outcome }}
|
||||
TARGET: ${{ needs.prepare.outputs.target }}
|
||||
REF: ${{ needs.prepare.outputs.ref }}
|
||||
MAC: ${{ needs.build-mac.result }}
|
||||
WIN: ${{ needs.build-win.result }}
|
||||
PUB: ${{ needs.publish.result }}
|
||||
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
run: |
|
||||
if [ "$STATE" = "success" ]; then
|
||||
MSG="已编译 **${TARGET}** 并发布到预发布:https://github.com/${{ github.repository }}/releases/tag/ip-prerelease"
|
||||
else
|
||||
MSG="编译 **${TARGET}** 失败,见日志:${RUN_URL}"
|
||||
fi
|
||||
gh issue comment "$ISSUE" --body "$MSG"
|
||||
set -e
|
||||
REPO="${{ github.repository }}"
|
||||
|
||||
line() {
|
||||
case "$2" in
|
||||
success) echo "- $1:✅ 成功" ;;
|
||||
skipped) echo "- $1:⏭ 未请求(跳过)" ;;
|
||||
cancelled) echo "- $1:⛔ 已取消" ;;
|
||||
*) echo "- $1:❌ 失败" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
{
|
||||
if [ "$PUB" = "success" ]; then
|
||||
echo "✅ **编译完成**:\`${TARGET}\`"
|
||||
else
|
||||
echo "❌ **编译未完成**:\`${TARGET}\`"
|
||||
fi
|
||||
echo
|
||||
line "macOS" "$MAC"
|
||||
line "Windows" "$WIN"
|
||||
echo
|
||||
echo "- 来源提交:\`${REF:0:7}\`"
|
||||
if [ "$PUB" = "success" ]; then
|
||||
echo "- 产物:https://github.com/${REPO}/releases/tag/ip-prerelease"
|
||||
else
|
||||
echo "- 日志:${RUN_URL}"
|
||||
fi
|
||||
} > result.md
|
||||
|
||||
gh issue comment "$ISSUE" --body-file result.md
|
||||
@@ -0,0 +1,293 @@
|
||||
name: build-release
|
||||
|
||||
# 在 Issue / PR 里评论触发「编译 + 发布正式版本」:
|
||||
# @build-release-bot build 1.1.3
|
||||
#
|
||||
# 与 build-bot 的区别:
|
||||
# build-bot 只编译,产物丢进 ip-prerelease(预发布,反复覆盖)
|
||||
# build-release 编译三平台,发一个 tag = 版本号的正式 Release(会更新 latest)
|
||||
#
|
||||
# 不会改动仓库里的 version.json:它由 GC-SAVEDOG 签名,CI 里没有签名私钥,
|
||||
# 重新 stamp 会产出一份客户端拒绝接受的清单。清单更新请走本地 ./build.sh stamp。
|
||||
|
||||
on:
|
||||
issue_comment:
|
||||
types: [created]
|
||||
|
||||
concurrency:
|
||||
group: release-manual
|
||||
cancel-in-progress: false
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
issues: write
|
||||
pull-requests: write
|
||||
|
||||
env:
|
||||
TZ: Asia/Shanghai
|
||||
DOTNET_VERSION: '8.0.x'
|
||||
FLUTTER_VERSION: '3.24.5'
|
||||
|
||||
jobs:
|
||||
prepare:
|
||||
if: |
|
||||
contains(github.event.comment.body, '@build-release-bot') &&
|
||||
(github.event.comment.author_association == 'OWNER' ||
|
||||
github.event.comment.author_association == 'MEMBER' ||
|
||||
github.event.comment.author_association == 'COLLABORATOR')
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
ok: ${{ steps.parse.outputs.ok }}
|
||||
version: ${{ steps.parse.outputs.version }}
|
||||
ref: ${{ steps.parse.outputs.ref }}
|
||||
reason: ${{ steps.parse.outputs.reason }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- id: parse
|
||||
name: 解析版本号并预检
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
BODY: ${{ github.event.comment.body }}
|
||||
run: |
|
||||
set -e
|
||||
# 只认 主.次.修订,其它写法直接忽略
|
||||
VER=$(printf '%s' "$BODY" \
|
||||
| grep -oiE '@build-release-bot[[:space:]]+build[[:space:]]+[0-9]+\.[0-9]+\.[0-9]+' \
|
||||
| head -1 \
|
||||
| awk '{print $NF}' || true)
|
||||
|
||||
if [ -z "$VER" ]; then
|
||||
echo "ok=false" >> "$GITHUB_OUTPUT"
|
||||
echo "reason=没有匹配到合法版本号(格式:@build-release-bot build 1.2.3)" >> "$GITHUB_OUTPUT"
|
||||
echo "未匹配到版本号,忽略"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "version=$VER" >> "$GITHUB_OUTPUT"
|
||||
echo "ref=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
|
||||
echo "版本号=$VER"
|
||||
|
||||
# tag 已存在就不能再发:重复 tag 会让客户端拿到两份不同内容
|
||||
if gh api "repos/${{ github.repository }}/git/ref/tags/${VER}" >/dev/null 2>&1; then
|
||||
echo "ok=false" >> "$GITHUB_OUTPUT"
|
||||
echo "reason=tag ${VER} 已存在,请换一个版本号" >> "$GITHUB_OUTPUT"
|
||||
echo "tag ${VER} 已存在"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "ok=true" >> "$GITHUB_OUTPUT"
|
||||
echo "reason=" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: 回复「开始编译并发布」
|
||||
if: steps.parse.outputs.ok == 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GH_REPO: ${{ github.repository }}
|
||||
ISSUE: ${{ github.event.issue.number }}
|
||||
VER: ${{ steps.parse.outputs.version }}
|
||||
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
run: |
|
||||
set -e
|
||||
cat > ack.md <<EOF
|
||||
🔨 **开始编译并发布 \`${VER}\`**
|
||||
|
||||
平台:macOS (arm64) + Windows (amd64 / arm64)
|
||||
|
||||
- 实时日志:${RUN_URL}
|
||||
|
||||
编译完成后会在这里回复结果。
|
||||
EOF
|
||||
gh issue comment "$ISSUE" --body-file ack.md
|
||||
|
||||
- name: 回复「忽略原因」
|
||||
if: steps.parse.outputs.ok != 'true'
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GH_REPO: ${{ github.repository }}
|
||||
ISSUE: ${{ github.event.issue.number }}
|
||||
REASON: ${{ steps.parse.outputs.reason }}
|
||||
run: |
|
||||
set -e
|
||||
gh issue comment "$ISSUE" --body "⏭ 未触发:${REASON}"
|
||||
|
||||
build-mac:
|
||||
needs: prepare
|
||||
if: needs.prepare.outputs.ok == 'true'
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ needs.prepare.outputs.ref }}
|
||||
|
||||
- uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: ${{ env.DOTNET_VERSION }}
|
||||
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||
channel: stable
|
||||
cache: true
|
||||
|
||||
- name: 环境信息
|
||||
run: |
|
||||
sw_vers
|
||||
xcodebuild -version
|
||||
flutter --version
|
||||
|
||||
- name: 编译 macOS
|
||||
env:
|
||||
GC_NO_PROGRESS: '1'
|
||||
run: ./build.sh build --targets=mac -version=${{ needs.prepare.outputs.version }}
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: mac-zip
|
||||
path: dist/mac-arm64/*.zip
|
||||
if-no-files-found: error
|
||||
retention-days: 5
|
||||
|
||||
build-win:
|
||||
needs: prepare
|
||||
if: needs.prepare.outputs.ok == 'true'
|
||||
runs-on: windows-latest
|
||||
defaults:
|
||||
run:
|
||||
shell: pwsh
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ needs.prepare.outputs.ref }}
|
||||
|
||||
- uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: ${{ env.DOTNET_VERSION }}
|
||||
|
||||
- uses: subosito/flutter-action@v2
|
||||
with:
|
||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||
channel: stable
|
||||
cache: true
|
||||
|
||||
- name: 编译 Windows(amd64 + arm64)
|
||||
run: ./build.ps1 build -Version ${{ needs.prepare.outputs.version }}
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: win-zip
|
||||
path: |
|
||||
dist/win-amd64/*.zip
|
||||
dist/win-arm64/*.zip
|
||||
if-no-files-found: error
|
||||
retention-days: 5
|
||||
|
||||
publish:
|
||||
needs: [prepare, build-mac, build-win]
|
||||
if: needs.prepare.outputs.ok == 'true' && needs.build-mac.result == 'success' && needs.build-win.result == 'success'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: artifacts
|
||||
|
||||
- name: 汇总产物
|
||||
run: |
|
||||
set -e
|
||||
mkdir -p out
|
||||
find artifacts -name '*.zip' -exec cp {} out/ \;
|
||||
ls -lh out
|
||||
|
||||
- name: 生成 sha256 清单
|
||||
working-directory: out
|
||||
run: |
|
||||
set -e
|
||||
shasum -a 256 *.zip > SHA256SUMS.txt 2>/dev/null || sha256sum *.zip > SHA256SUMS.txt
|
||||
cat SHA256SUMS.txt
|
||||
|
||||
- name: 发布 Release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GH_REPO: ${{ github.repository }}
|
||||
VER: ${{ needs.prepare.outputs.version }}
|
||||
REF: ${{ needs.prepare.outputs.ref }}
|
||||
ACTOR: ${{ github.event.comment.user.login }}
|
||||
ISSUE: ${{ github.event.issue.number }}
|
||||
run: |
|
||||
set -e
|
||||
cat > notes.md <<EOF
|
||||
GC ${VER}
|
||||
|
||||
- macOS(arm64)
|
||||
- Windows(amd64 / arm64)
|
||||
|
||||
触发人:@${ACTOR}(#${ISSUE})
|
||||
构建来源:\`${REF}\`
|
||||
|
||||
各包 sha256 见 \`SHA256SUMS.txt\`。
|
||||
|
||||
> macOS 包为 ad-hoc 签名,首次打开需右键 →「打开」,或在「系统设置 → 隐私与安全性」里放行。
|
||||
EOF
|
||||
|
||||
gh release create "$VER" out/* \
|
||||
--target "$REF" \
|
||||
--title "GC ${VER}" \
|
||||
--notes-file notes.md
|
||||
|
||||
echo "https://github.com/${{ github.repository }}/releases/tag/$VER" >> "$GITHUB_STEP_SUMMARY"
|
||||
|
||||
report:
|
||||
needs: [prepare, build-mac, build-win, publish]
|
||||
if: always() && needs.prepare.outputs.ok == 'true'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: 回帖结果
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GH_REPO: ${{ github.repository }}
|
||||
ISSUE: ${{ github.event.issue.number }}
|
||||
VER: ${{ needs.prepare.outputs.version }}
|
||||
MAC: ${{ needs.build-mac.result }}
|
||||
WIN: ${{ needs.build-win.result }}
|
||||
PUB: ${{ needs.publish.result }}
|
||||
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||
run: |
|
||||
set -e
|
||||
REPO="${{ github.repository }}"
|
||||
|
||||
line() {
|
||||
case "$2" in
|
||||
success) echo "- $1:✅ 成功" ;;
|
||||
skipped) echo "- $1:⏭ 跳过" ;;
|
||||
cancelled) echo "- $1:⛔ 已取消" ;;
|
||||
*) echo "- $1:❌ 失败" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
if [ "$PUB" = "success" ]; then
|
||||
HEADLINE="✅ **已发布 \`${VER}\`**"
|
||||
elif [ "$MAC" = "success" ] || [ "$WIN" = "success" ]; then
|
||||
HEADLINE="⚠️ **编译完成但未发布 \`${VER}\`**(需要两个平台都成功才会发 Release)"
|
||||
else
|
||||
HEADLINE="❌ **\`${VER}\` 编译失败**"
|
||||
fi
|
||||
|
||||
{
|
||||
echo "$HEADLINE"
|
||||
echo
|
||||
line "macOS" "$MAC"
|
||||
line "Windows" "$WIN"
|
||||
line "发布" "$PUB"
|
||||
echo
|
||||
if [ "$PUB" = "success" ]; then
|
||||
echo "- Release:https://github.com/${REPO}/releases/tag/${VER}"
|
||||
else
|
||||
echo "- 日志:${RUN_URL}"
|
||||
fi
|
||||
} > result.md
|
||||
|
||||
gh issue comment "$ISSUE" --body-file result.md
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
|
||||
build-mac:
|
||||
needs: meta
|
||||
runs-on: macos-14
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@@ -59,7 +59,6 @@ jobs:
|
||||
- name: 编译 macOS
|
||||
env:
|
||||
GC_TARGETS: mac
|
||||
GC_NO_CODESIGN: '1'
|
||||
GC_NO_PROGRESS: '1'
|
||||
run: ./build.sh build --targets=mac
|
||||
|
||||
|
||||
@@ -61,19 +61,20 @@ jobs:
|
||||
echo "ahead=$AHEAD" >> "$GITHUB_OUTPUT"
|
||||
|
||||
# GitHub 的 mergeable 字段是异步计算的,前几次可能为 null,重试几次
|
||||
MERGEABLE="null"
|
||||
STATE="unknown"
|
||||
CONFLICT="unknown"
|
||||
for i in 1 2 3 4 5; do
|
||||
INFO=$(gh api "repos/${{ github.repository }}/pulls/${PR}" --jq '.mergeable, .mergeable_state' 2>/dev/null || true)
|
||||
CONFLICT=$(printf '%s\n' "$INFO" | sed -n '1p')
|
||||
STATE=$(printf '%s\n' "$INFO" | sed -n '2p')
|
||||
if [ "$CONFLICT" = "true" ] || [ "$CONFLICT" = "false" ]; then break; fi
|
||||
sleep 3
|
||||
for i in 1 2 3 4 5 6 7 8; do
|
||||
read -r MERGEABLE STATE <<< "$(gh api "repos/${{ github.repository }}/pulls/${PR}" \
|
||||
--jq '"\(.mergeable | tostring) \(.mergeable_state // "unknown")"' 2>/dev/null || echo 'null unknown')"
|
||||
# mergeable 只有 true / false 才是算完的结果,null 说明还在算
|
||||
if [ "$MERGEABLE" = "true" ] || [ "$MERGEABLE" = "false" ]; then break; fi
|
||||
sleep 4
|
||||
done
|
||||
|
||||
case "$CONFLICT" in
|
||||
false) echo "conflict=ok" >> "$GITHUB_OUTPUT" ;;
|
||||
true) echo "conflict=conflict" >> "$GITHUB_OUTPUT" ;;
|
||||
# 注意语义:mergeable=true 表示「可以合并」,false 才是冲突
|
||||
case "$MERGEABLE" in
|
||||
true) echo "conflict=ok" >> "$GITHUB_OUTPUT" ;;
|
||||
false) echo "conflict=conflict" >> "$GITHUB_OUTPUT" ;;
|
||||
*) echo "conflict=unknown" >> "$GITHUB_OUTPUT" ;;
|
||||
esac
|
||||
echo "merge_state=$STATE" >> "$GITHUB_OUTPUT"
|
||||
@@ -83,8 +84,9 @@ jobs:
|
||||
continue-on-error: true
|
||||
run: |
|
||||
set -o pipefail
|
||||
dotnet restore GC.sln > dotnet-restore.log 2>&1
|
||||
dotnet build GC.sln -c Release --no-restore 2>&1 | tee dotnet-build.log
|
||||
dotnet restore GC.sln > "$GITHUB_WORKSPACE/dotnet-restore.log" 2>&1
|
||||
dotnet build GC.sln -c Release --no-restore 2>&1 \
|
||||
| tee "$GITHUB_WORKSPACE/dotnet-build.log"
|
||||
exit ${PIPESTATUS[0]}
|
||||
|
||||
- id: flutter
|
||||
@@ -93,8 +95,12 @@ jobs:
|
||||
working-directory: GC-UI/frontend
|
||||
run: |
|
||||
set -o pipefail
|
||||
flutter pub get 2>&1 | tee ../flutter-pubget.log
|
||||
flutter analyze 2>&1 | tee ../flutter-analyze.log
|
||||
# 日志统一写到仓库根目录:后面的汇总步骤在根目录读,路径必须一致
|
||||
flutter pub get 2>&1 | tee "$GITHUB_WORKSPACE/flutter-pubget.log"
|
||||
# 仓库里已有历史 warning / info,不应该让它们卡住合并;
|
||||
# 只把真正的 error 当失败。
|
||||
flutter analyze --no-fatal-infos --no-fatal-warnings 2>&1 \
|
||||
| tee "$GITHUB_WORKSPACE/flutter-analyze.log"
|
||||
exit ${PIPESTATUS[0]}
|
||||
|
||||
- id: summary
|
||||
@@ -111,13 +117,22 @@ jobs:
|
||||
set -e
|
||||
bad=0
|
||||
|
||||
# 静态分析结果分「错误」和「警告/提示」:只有错误才算不通过
|
||||
FE=$(grep -cE '^ *error •' flutter-analyze.log 2>/dev/null || true); FE=${FE:-0}
|
||||
FW=$(grep -cE '^ *(warning|info) •' flutter-analyze.log 2>/dev/null || true); FW=${FW:-0}
|
||||
|
||||
case "$DOTNET_OUTCOME" in
|
||||
success) DOTNET_LINE="✅ .NET 编译通过" ;;
|
||||
*) DOTNET_LINE="❌ .NET 编译失败"; bad=1 ;;
|
||||
esac
|
||||
case "$FLUTTER_OUTCOME" in
|
||||
success) FLUTTER_LINE="✅ Flutter 静态分析通过" ;;
|
||||
*) FLUTTER_LINE="❌ Flutter 静态分析有问题"; bad=1 ;;
|
||||
success)
|
||||
if [ "$FW" -gt 0 ]; then
|
||||
FLUTTER_LINE="✅ 无错误(另有 ${FW} 条历史 warning/info,未阻断)"
|
||||
else
|
||||
FLUTTER_LINE="✅ 无错误"
|
||||
fi ;;
|
||||
*) FLUTTER_LINE="❌ 有 ${FE} 个 error"; bad=1 ;;
|
||||
esac
|
||||
case "$CONFLICT" in
|
||||
ok) CONFLICT_LINE="✅ 与目标分支无冲突" ;;
|
||||
@@ -153,10 +168,17 @@ jobs:
|
||||
echo
|
||||
echo '```'
|
||||
echo "== dotnet build(尾部 40 行)=="
|
||||
tail -40 dotnet-build.log 2>/dev/null || echo "(无日志)"
|
||||
tail -40 dotnet-build.log 2>/dev/null || echo "(日志缺失:编译步骤可能未执行)"
|
||||
echo
|
||||
echo "== flutter analyze(尾部 40 行)=="
|
||||
tail -40 flutter-analyze.log 2>/dev/null || echo "(无日志)"
|
||||
if [ -f flutter-analyze.log ]; then
|
||||
tail -40 flutter-analyze.log
|
||||
elif [ -f flutter-pubget.log ]; then
|
||||
echo "(analyze 未产生日志,pub get 输出如下)"
|
||||
tail -20 flutter-pubget.log
|
||||
else
|
||||
echo "(日志缺失:Flutter 步骤可能未执行)"
|
||||
fi
|
||||
echo '```'
|
||||
echo
|
||||
echo "</details>"
|
||||
|
||||
@@ -124,9 +124,18 @@ public sealed record UpdateCheckDto(
|
||||
public sealed record ContributorDto(string Name, int Contributions, string? AvatarUrl);
|
||||
|
||||
// ---- 用户 API DTO ----
|
||||
public sealed record RegisterRequest(string Username, string Password);
|
||||
public sealed record RegisterRequest(
|
||||
string Username,
|
||||
string Password,
|
||||
string? CaptchaId = null,
|
||||
string? Captcha = null);
|
||||
|
||||
public sealed record LoginRequest(string Username, string Password);
|
||||
public sealed record ThemeRequest(string Color, int Cost);
|
||||
|
||||
/// <summary>换主题色:只传颜色,价格由服务端按预置/自定义判定。</summary>
|
||||
public sealed record ThemeRequest(string Color, int? Cost = null);
|
||||
|
||||
public sealed record CaptchaDto(string Id, string Question);
|
||||
|
||||
|
||||
/// <summary>「重新下载启动器」结果:State = Ready / UpToDate / Failed。</summary>
|
||||
|
||||
@@ -193,7 +193,7 @@ public static class BackendServer
|
||||
// 简单 session 存储:key = username(lower), value = session token
|
||||
var userSessions = new System.Collections.Concurrent.ConcurrentDictionary<string, string>();
|
||||
|
||||
// 中间件:从 header 提取当前用户
|
||||
// 中间件:从 header 提取当前用户;没有 token 时回退到 user.yaml 记住的用户(自动登录)
|
||||
app.Use(async (context, next) =>
|
||||
{
|
||||
context.Items["user"] = null as string;
|
||||
@@ -209,14 +209,52 @@ public static class BackendServer
|
||||
}
|
||||
}
|
||||
}
|
||||
if (context.Items["user"] is not string u || string.IsNullOrEmpty(u))
|
||||
context.Items["user"] = userService.RestoredUser;
|
||||
await next();
|
||||
});
|
||||
|
||||
// 统一的用户响应体:前端一次拿齐签到 / 主题色需要的所有字段
|
||||
object UserPayload(UserRecord r)
|
||||
{
|
||||
var today = DateTime.UtcNow.Date;
|
||||
int nextConsecutive;
|
||||
if (!r.LastSignIn.HasValue) nextConsecutive = 1;
|
||||
else
|
||||
{
|
||||
var diff = (today - r.LastSignIn.Value.Date).Days;
|
||||
nextConsecutive = diff <= 1 ? r.ConsecutiveDays + 1 : 1;
|
||||
}
|
||||
var refund = UserService.RefundRemaining(r);
|
||||
|
||||
return new
|
||||
{
|
||||
username = r.Username,
|
||||
points = r.Points,
|
||||
consecutive_days = r.ConsecutiveDays,
|
||||
cycle_day = UserService.CycleDay(r.ConsecutiveDays),
|
||||
cycle_days = UserService.SignInCycleDays,
|
||||
today_signed = r.LastSignIn.HasValue && r.LastSignIn.Value.Date == today,
|
||||
next_reward = UserService.GetSignInReward(UserService.CycleDay(nextConsecutive)),
|
||||
last_sign_in = r.LastSignIn?.ToString("yyyy-MM-dd") ?? "",
|
||||
theme_color = r.ThemeColor ?? UserService.DefaultThemeColor,
|
||||
theme_paid = r.ThemePaid,
|
||||
refund_seconds = refund.HasValue ? (int)refund.Value.TotalSeconds : 0
|
||||
};
|
||||
}
|
||||
|
||||
// 人机验证:算术题,5 分钟有效、一次性
|
||||
app.MapGet("/api/user/captcha", () =>
|
||||
{
|
||||
var (id, question) = userService.IssueCaptcha();
|
||||
return Results.Ok(new CaptchaDto(id, question));
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/register", (RegisterRequest? req) => {
|
||||
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
|
||||
if (string.IsNullOrWhiteSpace(req.Username)) return Results.BadRequest(new { error = "用户名不能为空" });
|
||||
if (string.IsNullOrWhiteSpace(req.Password)) return Results.BadRequest(new { error = "密码不能为空" });
|
||||
var ok = userService.Register(req.Username, req.Password, out var err);
|
||||
var ok = userService.Register(req.Username, req.Password, req.CaptchaId, req.Captcha, out var err);
|
||||
return ok ? Results.Ok(new { message = "注册成功" }) : Results.BadRequest(new { error = err });
|
||||
});
|
||||
|
||||
@@ -226,7 +264,9 @@ public static class BackendServer
|
||||
if (!ok) return Results.BadRequest(new { error = err });
|
||||
// 生成 session token
|
||||
var sessionToken = Convert.ToBase64String(System.Security.Cryptography.RandomNumberGenerator.GetBytes(32)).Replace("/", "_").Replace("+", "-").Substring(0, 32);
|
||||
userSessions[rec!.Username.ToLower()] = sessionToken;
|
||||
userSessions[rec!.Username.ToLowerInvariant()] = sessionToken;
|
||||
// 记住登录:写 .GC/user/user.yaml,下次启动自动登录
|
||||
userService.SaveSession(rec.Username, sessionToken);
|
||||
return Results.Ok(new {
|
||||
username = rec.Username,
|
||||
points = rec.Points,
|
||||
@@ -237,18 +277,19 @@ public static class BackendServer
|
||||
});
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/logout", (HttpContext ctx) => {
|
||||
var username = ctx.Items["user"] as string;
|
||||
if (!string.IsNullOrEmpty(username)) userSessions.TryRemove(username, out _);
|
||||
userService.ClearSession();
|
||||
return Results.Ok(new { message = "已退出登录" });
|
||||
});
|
||||
|
||||
app.MapGet("/api/user/me", (HttpContext ctx) =>
|
||||
{
|
||||
var username = ctx.Items["user"] as string;
|
||||
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
|
||||
return Results.Json(new { error = "未登录" }, statusCode: 401);
|
||||
return Results.Ok(new {
|
||||
username = rec.Username,
|
||||
points = rec.Points,
|
||||
consecutive_days = rec.ConsecutiveDays,
|
||||
last_sign_in = rec.LastSignIn?.ToString("yyyy-MM-dd") ?? "",
|
||||
theme_color = rec.ThemeColor ?? ""
|
||||
});
|
||||
return Results.Ok(UserPayload(rec));
|
||||
});
|
||||
|
||||
app.MapPost("/api/user/signin", (HttpContext ctx) =>
|
||||
@@ -256,18 +297,16 @@ public static class BackendServer
|
||||
var username = ctx.Items["user"] as string;
|
||||
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
|
||||
return Results.Json(new { error = "未登录" }, statusCode: 401);
|
||||
var ok = userService.UpdateSignIn(username, out var err);
|
||||
var ok = userService.UpdateSignIn(username, out var err, out var reward);
|
||||
if (!ok)
|
||||
{
|
||||
if (err == "今日已签到")
|
||||
return Results.Ok(new { message = err, points = rec.Points, consecutive_days = rec.ConsecutiveDays });
|
||||
return Results.Ok(new { message = err, user = UserPayload(rec) });
|
||||
return Results.BadRequest(new { error = err });
|
||||
}
|
||||
return Results.Ok(new {
|
||||
points = rec.Points,
|
||||
consecutive_days = rec.ConsecutiveDays,
|
||||
reward = userService.GetSignInReward(rec.ConsecutiveDays),
|
||||
last_sign_in = rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""
|
||||
reward,
|
||||
user = UserPayload(rec)
|
||||
});
|
||||
});
|
||||
|
||||
@@ -277,8 +316,15 @@ public static class BackendServer
|
||||
if (string.IsNullOrEmpty(username) || !userService.TryGetUser(username, out var rec))
|
||||
return Results.Json(new { error = "未登录" }, statusCode: 401);
|
||||
if (req == null) return Results.BadRequest(new { error = "请求体为空" });
|
||||
var ok = userService.ChangeThemeColor(username, req.Color, req.Cost, out var err);
|
||||
return ok ? Results.Ok(new { message = "主题已更新", points = rec.Points, theme_color = rec.ThemeColor }) : Results.BadRequest(new { error = err });
|
||||
|
||||
var ok = userService.ChangeThemeColor(username, req.Color, out var err, out var refunded);
|
||||
if (!ok) return Results.BadRequest(new { error = err });
|
||||
|
||||
return Results.Ok(new {
|
||||
message = "主题已更新",
|
||||
refunded,
|
||||
user = UserPayload(rec)
|
||||
});
|
||||
});
|
||||
|
||||
app.MapGet("/api/health", () => Results.Ok(new HealthDto(
|
||||
|
||||
@@ -9,43 +9,99 @@ using System.Text;
|
||||
namespace GC.UI.Server;
|
||||
|
||||
/// <summary>
|
||||
/// 本地用户系统:用户名/密码/积分,数据存在 .GC/user/ 目录。
|
||||
/// 本地用户系统:注册 / 登录 / 签到 / 积分 / 主题色。
|
||||
///
|
||||
/// 目录结构(都在 .GC/user 下):
|
||||
/// .GC/user/user.yaml 本地登录信息(当前用户 + session token)
|
||||
/// .GC/user/<用户名>/pw.yaml 该用户的账号数据(用户名、积分、密码 sha512)
|
||||
///
|
||||
/// 密码只存 sha512(密码 + ":" + 随机盐),不存明文;盐单独一行保存。
|
||||
/// </summary>
|
||||
public sealed class UserService
|
||||
{
|
||||
/// <summary>默认主题色(蓝色):免费。</summary>
|
||||
public const string DefaultThemeColor = "4A90D9";
|
||||
|
||||
/// <summary>预置颜色单价。</summary>
|
||||
public const int PresetColorCost = 50;
|
||||
|
||||
/// <summary>自定义颜色单价。</summary>
|
||||
public const int CustomColorCost = 150;
|
||||
|
||||
/// <summary>退款窗口:购买后 1 小时内换色可退 80%。</summary>
|
||||
public static readonly TimeSpan RefundWindow = TimeSpan.FromHours(1);
|
||||
|
||||
/// <summary>退款比例。</summary>
|
||||
public const double RefundRate = 0.8;
|
||||
|
||||
/// <summary>签到周期长度(天)。</summary>
|
||||
public const int SignInCycleDays = 30;
|
||||
|
||||
private static readonly string[] PresetColors =
|
||||
{
|
||||
"4A90D9", "E74C3C", "27AE60", "9B59B6",
|
||||
"F39C12", "1ABC9C", "E91E63", "2C3E50"
|
||||
};
|
||||
|
||||
private readonly string _userDir;
|
||||
private readonly string _sessionFile;
|
||||
|
||||
public readonly ConcurrentDictionary<string, UserRecord> _users = new();
|
||||
|
||||
/// <summary>验证码:id → (答案, 过期时间)。一次性,用后即删。</summary>
|
||||
private readonly ConcurrentDictionary<string, (int Answer, DateTime Expires)> _captchas = new();
|
||||
|
||||
/// <summary>记住的登录用户(来自 user.yaml),没有显式 token 时用它。</summary>
|
||||
private string? _restoredUser;
|
||||
|
||||
public UserService(string homeRoot)
|
||||
{
|
||||
_userDir = Path.Combine(homeRoot, "user");
|
||||
_sessionFile = Path.Combine(_userDir, "user.yaml");
|
||||
Directory.CreateDirectory(_userDir);
|
||||
LoadAll();
|
||||
LoadSession();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 读写磁盘
|
||||
|
||||
private void LoadAll()
|
||||
{
|
||||
foreach (var file in Directory.GetFiles(_userDir, "*.yaml"))
|
||||
foreach (var dir in Directory.GetDirectories(_userDir))
|
||||
{
|
||||
try
|
||||
{
|
||||
var username = Path.GetFileNameWithoutExtension(file);
|
||||
var content = File.ReadAllText(file);
|
||||
var rec = DeserializeUser(username, content);
|
||||
if (rec != null) _users[username] = rec;
|
||||
var file = Path.Combine(dir, "pw.yaml");
|
||||
if (!File.Exists(file)) continue;
|
||||
var rec = DeserializeUser(Path.GetFileName(dir), File.ReadAllText(file));
|
||||
if (rec != null) _users[rec.Username.ToLowerInvariant()] = rec;
|
||||
}
|
||||
catch { /* 忽略损坏文件 */ }
|
||||
catch { /* 单个用户文件损坏不影响其他用户 */ }
|
||||
}
|
||||
|
||||
// 兼容旧布局:.GC/user/<用户名>.yaml 直接放在根下(迁移到 <用户名>/pw.yaml)
|
||||
foreach (var legacy in Directory.GetFiles(_userDir, "*.yaml"))
|
||||
{
|
||||
if (string.Equals(legacy, _sessionFile, StringComparison.OrdinalIgnoreCase)) continue;
|
||||
try
|
||||
{
|
||||
var name = Path.GetFileNameWithoutExtension(legacy);
|
||||
var rec = DeserializeUser(name, File.ReadAllText(legacy));
|
||||
if (rec == null) continue;
|
||||
_users[rec.Username.ToLowerInvariant()] = rec;
|
||||
SaveUser(rec);
|
||||
File.Delete(legacy);
|
||||
}
|
||||
catch { /* 忽略 */ }
|
||||
}
|
||||
}
|
||||
|
||||
private UserRecord? DeserializeUser(string username, string yaml)
|
||||
private static UserRecord? DeserializeUser(string fallbackName, string yaml)
|
||||
{
|
||||
var lines = yaml.Split('\n', StringSplitOptions.RemoveEmptyEntries);
|
||||
string? pwHash = null, pwSalt = null;
|
||||
int points = 0;
|
||||
DateTime? lastSignIn = null;
|
||||
int consecutiveDays = 0;
|
||||
string? themeColor = null;
|
||||
string? username = null, pwHash = null, pwSalt = null, themeColor = null;
|
||||
int points = 0, consecutiveDays = 0, themePaid = 0;
|
||||
DateTime? lastSignIn = null, themePaidAt = null;
|
||||
|
||||
foreach (var line in lines)
|
||||
{
|
||||
@@ -55,44 +111,190 @@ public sealed class UserService
|
||||
var val = parts[1].Trim();
|
||||
switch (key)
|
||||
{
|
||||
case "username": username = val; break;
|
||||
case "pw_hash": pwHash = val; break;
|
||||
case "pw_salt": pwSalt = val; break;
|
||||
case "points": points = int.TryParse(val, out var p) ? p : 0; break;
|
||||
case "points": int.TryParse(val, out var p); points = p; break;
|
||||
case "last_sign_in":
|
||||
if (DateTime.TryParse(val, out var ls)) lastSignIn = ls;
|
||||
break;
|
||||
case "consecutive_days": consecutiveDays = int.TryParse(val, out var d) ? d : 0; break;
|
||||
case "consecutive_days": int.TryParse(val, out var d); consecutiveDays = d; break;
|
||||
case "theme_color": themeColor = val; break;
|
||||
case "theme_paid": int.TryParse(val, out var tp); themePaid = tp; break;
|
||||
case "theme_paid_at":
|
||||
if (DateTime.TryParse(val, out var ta)) themePaidAt = ta;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(username)) username = fallbackName;
|
||||
if (pwHash == null || pwSalt == null) return null;
|
||||
return new UserRecord(username, pwHash, pwSalt, points, lastSignIn, consecutiveDays, themeColor);
|
||||
|
||||
return new UserRecord(username!, pwHash, pwSalt, points, lastSignIn, consecutiveDays,
|
||||
string.IsNullOrWhiteSpace(themeColor) ? DefaultThemeColor : themeColor,
|
||||
themePaid, themePaidAt);
|
||||
}
|
||||
|
||||
public bool Register(string username, string password, out string error)
|
||||
private void SaveUser(UserRecord rec)
|
||||
{
|
||||
try
|
||||
{
|
||||
var dir = Path.Combine(_userDir, SafeDirName(rec.Username));
|
||||
Directory.CreateDirectory(dir);
|
||||
|
||||
var yaml = new StringBuilder()
|
||||
.AppendLine($"username: {rec.Username}")
|
||||
.AppendLine($"pw_hash: {rec.PwHash}")
|
||||
.AppendLine($"pw_salt: {rec.PwSalt}")
|
||||
.AppendLine($"points: {rec.Points}")
|
||||
.AppendLine($"last_sign_in: {rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""}")
|
||||
.AppendLine($"consecutive_days: {rec.ConsecutiveDays}")
|
||||
.AppendLine($"theme_color: {rec.ThemeColor ?? DefaultThemeColor}")
|
||||
.AppendLine($"theme_paid: {rec.ThemePaid}")
|
||||
.AppendLine($"theme_paid_at: {rec.ThemePaidAt?.ToString("o") ?? ""}")
|
||||
.ToString();
|
||||
|
||||
File.WriteAllText(Path.Combine(dir, "pw.yaml"), yaml);
|
||||
}
|
||||
catch { /* 写盘失败不影响内存状态 */ }
|
||||
}
|
||||
|
||||
/// <summary>用户名做目录名时过滤掉路径分隔符与 Windows 保留字符。</summary>
|
||||
private static string SafeDirName(string username)
|
||||
{
|
||||
var invalid = Path.GetInvalidFileNameChars();
|
||||
var chars = username.Select(c => invalid.Contains(c) || c == '.' ? '_' : c).ToArray();
|
||||
var name = new string(chars).Trim();
|
||||
return string.IsNullOrEmpty(name) ? "_" : name;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 登录态
|
||||
|
||||
private void LoadSession()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!File.Exists(_sessionFile)) return;
|
||||
foreach (var line in File.ReadAllLines(_sessionFile))
|
||||
{
|
||||
var parts = line.Split(':', 2);
|
||||
if (parts.Length == 2 && parts[0].Trim() == "username")
|
||||
{
|
||||
var name = parts[1].Trim();
|
||||
if (!string.IsNullOrEmpty(name) && _users.ContainsKey(name.ToLowerInvariant()))
|
||||
_restoredUser = name.ToLowerInvariant();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch { /* 忽略 */ }
|
||||
}
|
||||
|
||||
public void SaveSession(string username, string token)
|
||||
{
|
||||
try
|
||||
{
|
||||
var lower = username.ToLowerInvariant();
|
||||
_restoredUser = lower;
|
||||
Directory.CreateDirectory(_userDir);
|
||||
File.WriteAllText(_sessionFile,
|
||||
$"username: {username}\nsession_token: {token}\n");
|
||||
}
|
||||
catch { /* 忽略 */ }
|
||||
}
|
||||
|
||||
public void ClearSession()
|
||||
{
|
||||
_restoredUser = null;
|
||||
try { if (File.Exists(_sessionFile)) File.Delete(_sessionFile); } catch { /* 忽略 */ }
|
||||
}
|
||||
|
||||
/// <summary>没有携带 token 时,回退到 user.yaml 里记住的用户(自动登录)。</summary>
|
||||
public string? RestoredUser => _restoredUser;
|
||||
|
||||
// ---------------------------------------------------------------- 验证码
|
||||
|
||||
/// <summary>签发一个算术验证码,5 分钟内有效,用后即焚。</summary>
|
||||
public (string Id, string Question) IssueCaptcha()
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
|
||||
// 顺手清理过期项,避免长时间运行后字典无限增长
|
||||
if (_captchas.Count > 128)
|
||||
{
|
||||
foreach (var kv in _captchas)
|
||||
if (kv.Value.Expires < now) _captchas.TryRemove(kv.Key, out _);
|
||||
}
|
||||
|
||||
var a = RandomNumberGenerator.GetInt32(2, 10);
|
||||
var b = RandomNumberGenerator.GetInt32(2, 10);
|
||||
var plus = RandomNumberGenerator.GetInt32(0, 2) == 0;
|
||||
var answer = plus ? a + b : Math.Max(a, b) - Math.Min(a, b);
|
||||
var id = Convert.ToHexString(RandomNumberGenerator.GetBytes(12)).ToLowerInvariant();
|
||||
|
||||
_captchas[id] = (answer, now.AddMinutes(5));
|
||||
var question = plus ? $"{a} + {b} = ?" : $"{Math.Max(a, b)} - {Math.Min(a, b)} = ?";
|
||||
return (id, question);
|
||||
}
|
||||
|
||||
public bool VerifyCaptcha(string? id, string? answer, out string error)
|
||||
{
|
||||
error = "";
|
||||
if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(answer))
|
||||
{
|
||||
error = "请先完成人机验证";
|
||||
return false;
|
||||
}
|
||||
if (!_captchas.TryRemove(id, out var entry))
|
||||
{
|
||||
error = "验证码已失效,请重新获取";
|
||||
return false;
|
||||
}
|
||||
if (entry.Expires < DateTime.UtcNow)
|
||||
{
|
||||
error = "验证码已过期,请重新获取";
|
||||
return false;
|
||||
}
|
||||
if (!int.TryParse(answer.Trim(), out var value) || value != entry.Answer)
|
||||
{
|
||||
error = "验证码答案错误";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 账号
|
||||
|
||||
public bool Register(string username, string password, string? captchaId, string? captcha,
|
||||
out string error)
|
||||
{
|
||||
if (!VerifyCaptcha(captchaId, captcha, out error)) return false;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(username) || username.Length > 20)
|
||||
{
|
||||
error = "用户名无效";
|
||||
error = "用户名需为 1–20 个字符";
|
||||
return false;
|
||||
}
|
||||
if (username.Any(char.IsWhiteSpace))
|
||||
{
|
||||
error = "用户名不能包含空格";
|
||||
return false;
|
||||
}
|
||||
if (_users.ContainsKey(username.Trim().ToLowerInvariant()))
|
||||
{
|
||||
error = "用户名已存在,请换一个";
|
||||
return false;
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(password) || password.Length < 6)
|
||||
{
|
||||
error = "密码至少6位";
|
||||
return false;
|
||||
}
|
||||
if (_users.ContainsKey(username.ToLower()))
|
||||
{
|
||||
error = "用户名已存在";
|
||||
error = "密码至少 6 位";
|
||||
return false;
|
||||
}
|
||||
|
||||
var name = username.Trim();
|
||||
var salt = GenerateSalt();
|
||||
var hash = HashPassword(password, salt);
|
||||
var rec = new UserRecord(username, hash, salt, 0, null, 0, null);
|
||||
_users[username.ToLower()] = rec;
|
||||
var rec = new UserRecord(name, HashPassword(password, salt), salt,
|
||||
0, null, 0, DefaultThemeColor, 0, null);
|
||||
_users[name.ToLowerInvariant()] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
@@ -101,13 +303,12 @@ public sealed class UserService
|
||||
{
|
||||
error = "";
|
||||
record = null;
|
||||
if (!_users.TryGetValue(username.ToLower(), out var rec))
|
||||
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
|
||||
{
|
||||
error = "用户名或密码错误";
|
||||
return false;
|
||||
}
|
||||
var hash = HashPassword(password, rec.PwSalt);
|
||||
if (hash != rec.PwHash)
|
||||
if (HashPassword(password, rec.PwSalt) != rec.PwHash)
|
||||
{
|
||||
error = "用户名或密码错误";
|
||||
return false;
|
||||
@@ -116,24 +317,60 @@ public sealed class UserService
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool TryGetUser(string username, out UserRecord? record)
|
||||
=> _users.TryGetValue(username.Trim().ToLowerInvariant(), out record);
|
||||
|
||||
public UserRecord? GetFirstUser() => _users.Values.FirstOrDefault();
|
||||
|
||||
public bool UpdatePoints(string username, int deltaPoints, out string error)
|
||||
{
|
||||
error = "";
|
||||
if (!_users.TryGetValue(username, out var rec))
|
||||
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
|
||||
{
|
||||
error = "用户不存在";
|
||||
return false;
|
||||
}
|
||||
rec.Points = Math.Max(0, rec.Points + deltaPoints);
|
||||
_users[username] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool UpdateSignIn(string username, out string error)
|
||||
// ---------------------------------------------------------------- 签到
|
||||
|
||||
/// <summary>
|
||||
/// 30 天一循环的签到奖励。第 7/14/21/28 天给「周奖励」,第 30 天给满月奖励。
|
||||
/// </summary>
|
||||
public static int GetSignInReward(int cycleDay)
|
||||
{
|
||||
if (cycleDay < 1) cycleDay = 1;
|
||||
if (cycleDay > SignInCycleDays) cycleDay = ((cycleDay - 1) % SignInCycleDays) + 1;
|
||||
|
||||
return cycleDay switch
|
||||
{
|
||||
7 => 30,
|
||||
14 => 40,
|
||||
21 => 50,
|
||||
28 => 60,
|
||||
30 => 100,
|
||||
<= 6 => 10,
|
||||
<= 13 => 15,
|
||||
<= 20 => 20,
|
||||
<= 27 => 25,
|
||||
_ => 40
|
||||
};
|
||||
}
|
||||
|
||||
public static int CycleDay(int consecutiveDays)
|
||||
{
|
||||
if (consecutiveDays < 1) return 1;
|
||||
return ((consecutiveDays - 1) % SignInCycleDays) + 1;
|
||||
}
|
||||
|
||||
public bool UpdateSignIn(string username, out string error, out int reward)
|
||||
{
|
||||
error = "";
|
||||
if (!_users.TryGetValue(username, out var rec))
|
||||
reward = 0;
|
||||
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
|
||||
{
|
||||
error = "用户不存在";
|
||||
return false;
|
||||
@@ -142,85 +379,119 @@ public sealed class UserService
|
||||
var today = DateTime.UtcNow.Date;
|
||||
if (rec.LastSignIn.HasValue)
|
||||
{
|
||||
var last = rec.LastSignIn.Value.Date;
|
||||
var diff = (today - last).Days;
|
||||
var diff = (today - rec.LastSignIn.Value.Date).Days;
|
||||
if (diff == 0)
|
||||
{
|
||||
error = "今日已签到";
|
||||
return false;
|
||||
}
|
||||
if (diff == 1)
|
||||
{
|
||||
rec.ConsecutiveDays++;
|
||||
}
|
||||
else
|
||||
{
|
||||
rec.ConsecutiveDays = 1;
|
||||
}
|
||||
// 断签超过一天:连续天数重置(但 30 天周期按新的连续天数重新算)
|
||||
rec.ConsecutiveDays = diff == 1 ? rec.ConsecutiveDays + 1 : 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
rec.ConsecutiveDays = 1;
|
||||
}
|
||||
|
||||
rec.LastSignIn = today;
|
||||
|
||||
var cycleDay = (rec.ConsecutiveDays - 1) % 30 + 1;
|
||||
int reward = GetSignInReward(cycleDay);
|
||||
reward = GetSignInReward(CycleDay(rec.ConsecutiveDays));
|
||||
rec.Points += reward;
|
||||
|
||||
_users[username] = rec;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
public int GetSignInReward(int day)
|
||||
// ---------------------------------------------------------------- 主题色
|
||||
|
||||
/// <summary>某个颜色的价格:默认蓝免费,预置色 50,其它(自定义)150。</summary>
|
||||
public static int ThemeCost(string hex)
|
||||
{
|
||||
if (day <= 7) return 10;
|
||||
if (day <= 15) return 20;
|
||||
return 30;
|
||||
var h = NormalizeHex(hex);
|
||||
if (string.IsNullOrEmpty(h)) return -1;
|
||||
if (string.Equals(h, DefaultThemeColor, StringComparison.OrdinalIgnoreCase)) return 0;
|
||||
return PresetColors.Contains(h, StringComparer.OrdinalIgnoreCase)
|
||||
? PresetColorCost
|
||||
: CustomColorCost;
|
||||
}
|
||||
|
||||
public UserRecord? GetFirstUser()
|
||||
public static string NormalizeHex(string? hex)
|
||||
{
|
||||
return _users.Values.FirstOrDefault();
|
||||
if (string.IsNullOrWhiteSpace(hex)) return "";
|
||||
var h = hex.Trim().TrimStart('#');
|
||||
if (h.StartsWith("0x", StringComparison.OrdinalIgnoreCase)) h = h[2..];
|
||||
if (h.Length != 6) return "";
|
||||
return h.All(Uri.IsHexDigit) ? h.ToUpperInvariant() : "";
|
||||
}
|
||||
|
||||
public bool TryGetUser(string username, out UserRecord? record)
|
||||
{
|
||||
return _users.TryGetValue(username.ToLower(), out record);
|
||||
}
|
||||
|
||||
public bool ChangeThemeColor(string username, string colorHex, int cost, out string error)
|
||||
/// <summary>
|
||||
/// 换主题色。服务端自己算价,不信客户端传的 cost。
|
||||
/// 上次购买在 1 小时内,先按 80% 退还上次花费。
|
||||
/// </summary>
|
||||
public bool ChangeThemeColor(string username, string colorHex, out string error, out int refunded)
|
||||
{
|
||||
error = "";
|
||||
if (!_users.TryGetValue(username, out var rec))
|
||||
refunded = 0;
|
||||
|
||||
if (!_users.TryGetValue(username.Trim().ToLowerInvariant(), out var rec))
|
||||
{
|
||||
error = "用户不存在";
|
||||
return false;
|
||||
}
|
||||
if (rec.Points < cost)
|
||||
|
||||
var hex = NormalizeHex(colorHex);
|
||||
if (string.IsNullOrEmpty(hex))
|
||||
{
|
||||
error = "积分不足";
|
||||
error = "颜色格式应为 #RRGGBB";
|
||||
return false;
|
||||
}
|
||||
rec.Points -= cost;
|
||||
rec.ThemeColor = colorHex;
|
||||
_users[username] = rec;
|
||||
|
||||
var cost = ThemeCost(hex);
|
||||
if (cost < 0)
|
||||
{
|
||||
error = "颜色格式应为 #RRGGBB";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (string.Equals(NormalizeHex(rec.ThemeColor), hex, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
error = "当前已经是这个颜色";
|
||||
return false;
|
||||
}
|
||||
|
||||
// 1 小时内换色:退回上次花费的 80%
|
||||
var available = rec.Points;
|
||||
if (rec.ThemePaid > 0 && rec.ThemePaidAt.HasValue &&
|
||||
DateTime.UtcNow - rec.ThemePaidAt.Value <= RefundWindow)
|
||||
{
|
||||
refunded = (int)Math.Floor(rec.ThemePaid * RefundRate);
|
||||
available += refunded;
|
||||
}
|
||||
|
||||
if (available < cost)
|
||||
{
|
||||
error = refunded > 0
|
||||
? $"积分不足(含可退 {refunded},需 {cost})"
|
||||
: $"积分不足,需要 {cost} 积分";
|
||||
return false;
|
||||
}
|
||||
|
||||
rec.Points = available - cost;
|
||||
rec.ThemeColor = hex;
|
||||
rec.ThemePaid = cost;
|
||||
rec.ThemePaidAt = cost > 0 ? DateTime.UtcNow : null;
|
||||
SaveUser(rec);
|
||||
return true;
|
||||
}
|
||||
|
||||
private void SaveUser(UserRecord rec)
|
||||
/// <summary>距离退款窗口关闭还剩多久;没有可退的就返回 null。</summary>
|
||||
public static TimeSpan? RefundRemaining(UserRecord rec)
|
||||
{
|
||||
try
|
||||
{
|
||||
var file = Path.Combine(_userDir, $"{rec.Username.ToLower()}.yaml");
|
||||
var yaml = $"username: {rec.Username}\npw_hash: {rec.PwHash}\npw_salt: {rec.PwSalt}\npoints: {rec.Points}\nlast_sign_in: {rec.LastSignIn?.ToString("yyyy-MM-dd") ?? ""}\nconsecutive_days: {rec.ConsecutiveDays}\ntheme_color: {rec.ThemeColor ?? ""}\n";
|
||||
File.WriteAllText(file, yaml);
|
||||
}
|
||||
catch { /* 忽略写入失败 */ }
|
||||
if (rec.ThemePaid <= 0 || !rec.ThemePaidAt.HasValue) return null;
|
||||
var left = RefundWindow - (DateTime.UtcNow - rec.ThemePaidAt.Value);
|
||||
return left > TimeSpan.Zero ? left : null;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 散列
|
||||
|
||||
private static string GenerateSalt()
|
||||
{
|
||||
var bytes = new byte[16];
|
||||
@@ -232,8 +503,7 @@ public sealed class UserService
|
||||
private static string HashPassword(string password, string salt)
|
||||
{
|
||||
using var sha512 = SHA512.Create();
|
||||
var combined = Encoding.UTF8.GetBytes(password + ":" + salt);
|
||||
var hash = sha512.ComputeHash(combined);
|
||||
var hash = sha512.ComputeHash(Encoding.UTF8.GetBytes(password + ":" + salt));
|
||||
return Convert.ToBase64String(hash);
|
||||
}
|
||||
}
|
||||
@@ -248,7 +518,15 @@ public class UserRecord
|
||||
public int ConsecutiveDays { get; set; }
|
||||
public string? ThemeColor { get; set; }
|
||||
|
||||
public UserRecord(string username, string pwHash, string pwSalt, int points, DateTime? lastSignIn, int consecutiveDays, string? themeColor = null)
|
||||
/// <summary>当前这个颜色实际花了多少分(用于 1 小时内退款)。</summary>
|
||||
public int ThemePaid { get; set; }
|
||||
|
||||
/// <summary>购买该颜色的时间(UTC)。</summary>
|
||||
public DateTime? ThemePaidAt { get; set; }
|
||||
|
||||
public UserRecord(string username, string pwHash, string pwSalt, int points,
|
||||
DateTime? lastSignIn, int consecutiveDays, string? themeColor = null,
|
||||
int themePaid = 0, DateTime? themePaidAt = null)
|
||||
{
|
||||
Username = username;
|
||||
PwHash = pwHash;
|
||||
@@ -257,5 +535,7 @@ public class UserRecord
|
||||
LastSignIn = lastSignIn;
|
||||
ConsecutiveDays = consecutiveDays;
|
||||
ThemeColor = themeColor;
|
||||
ThemePaid = themePaid;
|
||||
ThemePaidAt = themePaidAt;
|
||||
}
|
||||
}
|
||||
@@ -514,46 +514,11 @@ class GcApi {
|
||||
/// 是否拿到了会话令牌(诊断用)。
|
||||
bool get hasSessionToken => _sessionToken != null;
|
||||
|
||||
/// 用户 session token(登录时后端返回,持久化到 ~/.GC/user/user.yaml)
|
||||
/// 用户 session token:登录时后端返回,只放内存。
|
||||
/// 持久化由后端负责(写 .GC/user/user.yaml),下次启动后端会用它自动登录,
|
||||
/// 前端不需要自己去猜 .GC 在哪。
|
||||
static String? _userToken;
|
||||
static String? _username;
|
||||
|
||||
static String? get userToken => _userToken;
|
||||
static String? get username => _username;
|
||||
|
||||
static Future<void> _loadUserToken() async {
|
||||
try {
|
||||
final dir = Directory('${Platform.environment['HOME'] ?? '.'}/.GC/user');
|
||||
if (!dir.existsSync()) return;
|
||||
final file = File('${dir.path}/user.yaml');
|
||||
if (!file.existsSync()) return;
|
||||
final lines = file.readAsLinesSync();
|
||||
for (var line in lines) {
|
||||
if (line.startsWith('username:')) _username = line.split(':').skip(1).join(':').trim();
|
||||
if (line.startsWith('session_token:')) _userToken = line.split(':').skip(1).join(':').trim();
|
||||
}
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
static Future<void> _saveUserToken(String username, String token) async {
|
||||
try {
|
||||
final dir = Directory('${Platform.environment['HOME'] ?? '.'}/.GC/user');
|
||||
dir.createSync(recursive: true);
|
||||
final file = File('${dir.path}/user.yaml');
|
||||
file.writeAsStringSync('username: $username\nsession_token: $token\n');
|
||||
_username = username;
|
||||
_userToken = token;
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
static Future<void> clearUserToken() async {
|
||||
_username = null;
|
||||
_userToken = null;
|
||||
try {
|
||||
final file = File('${Platform.environment['HOME'] ?? '.'}/.GC/user/user.yaml');
|
||||
if (file.existsSync()) file.deleteSync();
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
/// 带会话令牌的请求头;没有令牌时返回 const 空 map(调试/独立后端模式)。
|
||||
Map<String, String> get _authHeaders => {
|
||||
@@ -705,27 +670,34 @@ class GcApi {
|
||||
|
||||
// ==================== 用户系统 ====================
|
||||
|
||||
/// 初始化:加载本地保存的用户token
|
||||
Future<void> initUserSession() async {
|
||||
await _loadUserToken();
|
||||
/// 取一个人机验证题(算术题,5 分钟内有效、一次性)。
|
||||
Future<CaptchaInfo> captcha() async {
|
||||
final r = await _send('GET', '/api/user/captcha');
|
||||
return CaptchaInfo.fromJson(r as Map<String, dynamic>);
|
||||
}
|
||||
|
||||
/// 当前登录用户;未登录返回 null(后端会用 .GC/user/user.yaml 自动登录)。
|
||||
Future<Map<String, dynamic>?> me() async {
|
||||
try {
|
||||
final r = await _send('GET', '/api/user/me');
|
||||
return r as Map<String, dynamic>?;
|
||||
} on ApiException catch (e) {
|
||||
if (e.statusCode == 401 || e.statusCode == 403) {
|
||||
await clearUserToken();
|
||||
_userToken = null;
|
||||
return null;
|
||||
}
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>> register(String username, String password) async {
|
||||
final r = await _send('POST', '/api/user/register',
|
||||
body: {'username': username, 'password': password});
|
||||
Future<Map<String, dynamic>> register(String username, String password,
|
||||
{required String captchaId, required String captchaAnswer}) async {
|
||||
final r = await _send('POST', '/api/user/register', body: {
|
||||
'username': username,
|
||||
'password': password,
|
||||
'captchaId': captchaId,
|
||||
'captcha': captchaAnswer,
|
||||
});
|
||||
return r as Map<String, dynamic>;
|
||||
}
|
||||
|
||||
@@ -733,15 +705,18 @@ class GcApi {
|
||||
final r = await _send('POST', '/api/user/login',
|
||||
body: {'username': username, 'password': password});
|
||||
final result = r as Map<String, dynamic>;
|
||||
// 保存 session token
|
||||
if (result.containsKey('session_token')) {
|
||||
await _saveUserToken(username, result['session_token'] as String);
|
||||
}
|
||||
_userToken = result['session_token'] as String?;
|
||||
return result;
|
||||
}
|
||||
|
||||
/// 退出登录:清掉后端的 user.yaml 与内存 token。
|
||||
Future<void> logout() async {
|
||||
await clearUserToken();
|
||||
try {
|
||||
await _send('POST', '/api/user/logout');
|
||||
} catch (_) {
|
||||
// 后端连不上也要让界面退出
|
||||
}
|
||||
_userToken = null;
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>> signin() async {
|
||||
@@ -749,9 +724,22 @@ class GcApi {
|
||||
return r as Map<String, dynamic>;
|
||||
}
|
||||
|
||||
Future<Map<String, dynamic>> changeTheme(String color, int cost) async {
|
||||
final r = await _send('POST', '/api/user/theme',
|
||||
body: {'color': color, 'cost': cost});
|
||||
/// 换主题色:只传颜色,价格由后端判定(预置 50 / 自定义 150)。
|
||||
Future<Map<String, dynamic>> changeTheme(String color) async {
|
||||
final r = await _send('POST', '/api/user/theme', body: {'color': color});
|
||||
return r as Map<String, dynamic>;
|
||||
}
|
||||
}
|
||||
|
||||
/// 人机验证题
|
||||
class CaptchaInfo {
|
||||
const CaptchaInfo({required this.id, required this.question});
|
||||
|
||||
final String id;
|
||||
final String question;
|
||||
|
||||
factory CaptchaInfo.fromJson(Map<String, dynamic> json) => CaptchaInfo(
|
||||
id: json['id'] as String? ?? '',
|
||||
question: json['question'] as String? ?? '',
|
||||
);
|
||||
}
|
||||
@@ -160,7 +160,7 @@ class I18n {
|
||||
'user.login': '登录',
|
||||
'user.register': '注册',
|
||||
'user.pick': '二选一',
|
||||
'user.theme': '主题颜色',
|
||||
'user.themeColor': '主题颜色',
|
||||
'user.username': '用户名',
|
||||
'user.password': '密码',
|
||||
'user.option1': '选项一',
|
||||
@@ -175,6 +175,40 @@ class I18n {
|
||||
'user.fillAll': '请填写用户名和密码',
|
||||
'user.fillOptions': '请填写两个选项',
|
||||
'user.loginFirst': '请先登录',
|
||||
'user.notLoggedIn': '未登录',
|
||||
'user.loginHint': '登录后可签到攒积分、解锁主题色',
|
||||
'user.logout': '退出登录',
|
||||
'user.logoutDone': '已退出登录',
|
||||
'user.cycleDay': '第 {0} / {1} 天',
|
||||
'user.signedToday': '今天已签到,明天再来',
|
||||
'user.signedTodayShort': '已签到',
|
||||
'user.nextReward': '现在签到可得 {0} 积分',
|
||||
'user.refunded': '已退回',
|
||||
'user.usernameRule': '1–20 个字符,不能有空格,不能与他人重复',
|
||||
'user.captcha': '人机验证',
|
||||
'user.captchaMissing': '请先获取人机验证题',
|
||||
'user.captchaAnswer': '验证码答案',
|
||||
'user.fillCaptcha': '请填写验证码答案',
|
||||
'user.refreshCaptcha': '换一题',
|
||||
'user.noRecharge': '积分只能通过每日签到获得,不提供任何充值渠道。',
|
||||
'user.fortune': '人品值',
|
||||
'user.fortuneDesc': '每天可以无限次计算,纯属娱乐,不影响积分。',
|
||||
'user.fortuneIdle': '点一下,看看今天手气',
|
||||
'user.fortuneRoll': '开始计算',
|
||||
'user.fortuneAgain': '再算一次',
|
||||
'user.pickDesc': '填两个选项,随机帮你选一个。',
|
||||
'user.pickResult': '结果:',
|
||||
'user.themeDesc': '默认蓝色免费;预置色 50 积分一个,自定义色 150 积分一个。',
|
||||
'user.custom': '自定义',
|
||||
'user.customColor': '自定义颜色',
|
||||
'user.customColorCost': '自定义颜色需要 {0} 积分。',
|
||||
'user.confirmBuy': '购买并应用',
|
||||
'user.hexInvalid': '格式应为 #RRGGBB',
|
||||
'user.free': '免费',
|
||||
'user.themeUpdated': '主题色已更新',
|
||||
'user.refundHint': '1 小时内换色可退 80%,当前可退(剩余 {0})',
|
||||
'user.minutes': '分钟',
|
||||
'user.seconds': '秒',
|
||||
},
|
||||
'en': <String, String>{
|
||||
'app.name': 'Morris GC',
|
||||
@@ -327,7 +361,7 @@ class I18n {
|
||||
'user.login': 'Login',
|
||||
'user.register': 'Register',
|
||||
'user.pick': 'Pick One',
|
||||
'user.theme': 'Theme Color',
|
||||
'user.themeColor': 'Theme Color',
|
||||
'user.username': 'Username',
|
||||
'user.password': 'Password',
|
||||
'user.option1': 'Option A',
|
||||
@@ -342,6 +376,40 @@ class I18n {
|
||||
'user.fillAll': 'Please fill in username and password',
|
||||
'user.fillOptions': 'Please fill in both options',
|
||||
'user.loginFirst': 'Please login first',
|
||||
'user.notLoggedIn': 'Not signed in',
|
||||
'user.loginHint': 'Sign in to earn points and unlock theme colors',
|
||||
'user.logout': 'Sign out',
|
||||
'user.logoutDone': 'Signed out',
|
||||
'user.cycleDay': 'Day {0} / {1}',
|
||||
'user.signedToday': 'Signed in today, come back tomorrow',
|
||||
'user.signedTodayShort': 'Signed',
|
||||
'user.nextReward': 'Sign in now for {0} points',
|
||||
'user.refunded': 'refunded',
|
||||
'user.usernameRule': '1–20 chars, no spaces, must be unique',
|
||||
'user.captcha': 'Verification',
|
||||
'user.captchaMissing': 'Please load the verification question first',
|
||||
'user.captchaAnswer': 'Answer',
|
||||
'user.fillCaptcha': 'Please answer the verification question',
|
||||
'user.refreshCaptcha': 'New question',
|
||||
'user.noRecharge': 'Points come from daily check-ins only. There is no way to buy points.',
|
||||
'user.fortune': 'Luck Meter',
|
||||
'user.fortuneDesc': 'Unlimited rolls per day. Just for fun — no points involved.',
|
||||
'user.fortuneIdle': 'Tap to see how lucky you are today',
|
||||
'user.fortuneRoll': 'Roll',
|
||||
'user.fortuneAgain': 'Roll again',
|
||||
'user.pickDesc': 'Two options, one random pick.',
|
||||
'user.pickResult': 'Result:',
|
||||
'user.themeDesc': 'Default blue is free; preset colors cost 50, custom colors 150.',
|
||||
'user.custom': 'Custom',
|
||||
'user.customColor': 'Custom color',
|
||||
'user.customColorCost': 'A custom color costs {0} points.',
|
||||
'user.confirmBuy': 'Buy & apply',
|
||||
'user.hexInvalid': 'Format must be #RRGGBB',
|
||||
'user.free': 'Free',
|
||||
'user.themeUpdated': 'Theme color updated',
|
||||
'user.refundHint': 'Change within 1 hour for a 80% refund (left {0})',
|
||||
'user.minutes': 'min',
|
||||
'user.seconds': 's',
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -1,47 +1,95 @@
|
||||
/// 用户记录
|
||||
/// 用户记录(对应后端 UserPayload)
|
||||
class UserRecord {
|
||||
const UserRecord({
|
||||
required this.username,
|
||||
required this.points,
|
||||
required this.consecutiveDays,
|
||||
required this.cycleDay,
|
||||
required this.cycleDays,
|
||||
required this.todaySigned,
|
||||
required this.nextReward,
|
||||
this.lastSignIn,
|
||||
this.themeColor,
|
||||
this.themePaid = 0,
|
||||
this.refundSeconds = 0,
|
||||
});
|
||||
|
||||
final String username;
|
||||
final int points;
|
||||
|
||||
/// 连续签到天数(断签会重置)
|
||||
final int consecutiveDays;
|
||||
|
||||
/// 当前处在 30 天周期的第几天(1–30)
|
||||
final int cycleDay;
|
||||
|
||||
/// 周期长度,固定 30
|
||||
final int cycleDays;
|
||||
|
||||
/// 今天是否已签到
|
||||
final bool todaySigned;
|
||||
|
||||
/// 下一次签到能拿多少分
|
||||
final int nextReward;
|
||||
|
||||
final String? lastSignIn;
|
||||
|
||||
/// 形如 `4A90D9`(不带 #)
|
||||
final String? themeColor;
|
||||
|
||||
/// 当前这个颜色实际花了多少分
|
||||
final int themePaid;
|
||||
|
||||
/// 退款窗口剩余秒数(0 表示没有可退的)
|
||||
final int refundSeconds;
|
||||
|
||||
factory UserRecord.fromJson(Map<String, dynamic> json) {
|
||||
return UserRecord(
|
||||
username: json['username'] as String? ?? '',
|
||||
points: json['points'] as int? ?? 0,
|
||||
consecutiveDays: json['consecutive_days'] as int? ?? 0,
|
||||
points: (json['points'] as num?)?.toInt() ?? 0,
|
||||
consecutiveDays: (json['consecutive_days'] as num?)?.toInt() ?? 0,
|
||||
cycleDay: (json['cycle_day'] as num?)?.toInt() ?? 1,
|
||||
cycleDays: (json['cycle_days'] as num?)?.toInt() ?? 30,
|
||||
todaySigned: json['today_signed'] as bool? ?? false,
|
||||
nextReward: (json['next_reward'] as num?)?.toInt() ?? 10,
|
||||
lastSignIn: json['last_sign_in'] as String?,
|
||||
themeColor: json['theme_color'] as String?,
|
||||
themePaid: (json['theme_paid'] as num?)?.toInt() ?? 0,
|
||||
refundSeconds: (json['refund_seconds'] as num?)?.toInt() ?? 0,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 签到奖励配置(30天周期)
|
||||
/// 签到奖励:30 天一循环,第 7/14/21/28 天给周奖励,第 30 天给满月奖励。
|
||||
/// 与后端 `UserService.GetSignInReward` 保持一致。
|
||||
class SignInRewards {
|
||||
static const List<int> rewards = [
|
||||
10, 10, 10, 10, 10, 10, 10, // 第1-7天:每天+10
|
||||
20, 20, 20, 20, 20, 20, 20, // 第8-15天:每天+20
|
||||
30, 30, 30, 30, 30, 30, 30, // 第16-23天:每天+30
|
||||
30, 30, 30, 30, 30, 30, 30, // 第24-30天:每天+30
|
||||
];
|
||||
static const int cycleDays = 30;
|
||||
|
||||
static int getReward(int day) {
|
||||
if (day < 1) day = 1;
|
||||
if (day > 30) day = ((day - 1) % 30) + 1;
|
||||
return rewards[day - 1];
|
||||
var d = day;
|
||||
if (d < 1) d = 1;
|
||||
if (d > cycleDays) d = ((d - 1) % cycleDays) + 1;
|
||||
switch (d) {
|
||||
case 7:
|
||||
return 30;
|
||||
case 14:
|
||||
return 40;
|
||||
case 21:
|
||||
return 50;
|
||||
case 28:
|
||||
return 60;
|
||||
case 30:
|
||||
return 100;
|
||||
}
|
||||
if (d <= 6) return 10;
|
||||
if (d <= 13) return 15;
|
||||
if (d <= 20) return 20;
|
||||
if (d <= 27) return 25;
|
||||
return 40;
|
||||
}
|
||||
}
|
||||
|
||||
/// 主题颜色
|
||||
/// 主题颜色:预置色 50 分一个,自定义色 150 分一个,默认蓝免费。
|
||||
class ThemeColor {
|
||||
const ThemeColor({required this.name, required this.hex, required this.cost});
|
||||
|
||||
@@ -49,14 +97,58 @@ class ThemeColor {
|
||||
final String hex;
|
||||
final int cost;
|
||||
|
||||
static const List<ThemeColor> predefined = [
|
||||
ThemeColor(name: '蓝色', hex: '4A90D9', cost: 0),
|
||||
ThemeColor(name: '红色', hex: 'E74C3C', cost: 50),
|
||||
ThemeColor(name: '绿色', hex: '27AE60', cost: 50),
|
||||
ThemeColor(name: '紫色', hex: '9B59B6', cost: 50),
|
||||
ThemeColor(name: '橙色', hex: 'F39C12', cost: 50),
|
||||
ThemeColor(name: '青色', hex: '1ABC9C', cost: 50),
|
||||
ThemeColor(name: '粉色', hex: 'E91E63', cost: 50),
|
||||
ThemeColor(name: '深蓝', hex: '2C3E50', cost: 50),
|
||||
/// 默认色(免费)
|
||||
static const String defaultHex = '4A90D9';
|
||||
|
||||
/// 预置色单价
|
||||
static const int presetCost = 50;
|
||||
|
||||
/// 自定义色单价
|
||||
static const int customCost = 150;
|
||||
|
||||
/// 购买后 1 小时内换色可退 80%
|
||||
static const Duration refundWindow = Duration(hours: 1);
|
||||
static const double refundRate = 0.8;
|
||||
|
||||
static const List<ThemeColor> predefined = <ThemeColor>[
|
||||
ThemeColor(name: '蓝色', hex: defaultHex, cost: 0),
|
||||
ThemeColor(name: '红色', hex: 'E74C3C', cost: presetCost),
|
||||
ThemeColor(name: '绿色', hex: '27AE60', cost: presetCost),
|
||||
ThemeColor(name: '紫色', hex: '9B59B6', cost: presetCost),
|
||||
ThemeColor(name: '橙色', hex: 'F39C12', cost: presetCost),
|
||||
ThemeColor(name: '青色', hex: '1ABC9C', cost: presetCost),
|
||||
ThemeColor(name: '粉色', hex: 'E91E63', cost: presetCost),
|
||||
ThemeColor(name: '深蓝', hex: '2C3E50', cost: presetCost),
|
||||
];
|
||||
|
||||
/// 某个十六进制颜色的价格;默认蓝 0,预置色 50,其它 150。
|
||||
static int costOf(String hex) {
|
||||
final h = hex.replaceAll('#', '').toUpperCase();
|
||||
if (h == defaultHex) return 0;
|
||||
for (final c in predefined) {
|
||||
if (c.hex.toUpperCase() == h) return presetCost;
|
||||
}
|
||||
return customCost;
|
||||
}
|
||||
}
|
||||
|
||||
/// 人品值结果
|
||||
class FortuneResult {
|
||||
const FortuneResult(this.value, this.comment);
|
||||
|
||||
final int value;
|
||||
final String comment;
|
||||
|
||||
/// 0–100,越高越「人品爆发」
|
||||
static String commentFor(int value) {
|
||||
if (value >= 96) return '欧皇附体,今天买彩票吧';
|
||||
if (value >= 90) return '运气爆棚,适合干大事';
|
||||
if (value >= 80) return '手气不错,稳';
|
||||
if (value >= 65) return '中上水平,稍微努一下';
|
||||
if (value >= 50) return '普普通通,够用';
|
||||
if (value >= 35) return '有点背,低调点';
|
||||
if (value >= 20) return '今天别赌任何东西';
|
||||
if (value >= 8) return '极差,建议躺平';
|
||||
return '非酋之王,明天再来';
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -37,15 +37,12 @@ flutter_build() {
|
||||
_flutter pub get || return 1
|
||||
fi
|
||||
|
||||
# CI 上没有签名证书:GC_NO_CODESIGN=1 时给 macOS 加 --no-codesign,
|
||||
# 直接产出未签名的 .app(用户首次打开需右键「打开」或在系统设置里放行)。
|
||||
_flags="--release"
|
||||
if [ "${GC_NO_CODESIGN:-0}" = 1 ] && [ "$_plat" = macos ]; then
|
||||
_flags="$_flags --no-codesign"
|
||||
fi
|
||||
|
||||
# 注意:macOS 的 `flutter build macos` 没有 --no-codesign 选项(那是 iOS 的),
|
||||
# 传了会直接报 "Could not find an option named no-codesign"。
|
||||
# macOS 模板默认用 ad-hoc 签名(CODE_SIGN_IDENTITY = "-"),无证书的 CI 也能构建出 .app,
|
||||
# 只是首次打开需要右键「打开」。
|
||||
run_logged "$GC_ROOT/build/logs/flutter-$_plat.log" "Flutter $_plat 构建 " \
|
||||
_flutter build "$_plat" $_flags || return 1
|
||||
_flutter build "$_plat" --release || return 1
|
||||
step_ok "Flutter ${_plat}"
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user