Merge origin/main; keep intercept env keys in migrate skill.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
hashbro
@@ -1,289 +1,259 @@
|
|||||||
---
|
---
|
||||||
name: coruna-lab-migrate
|
name: coruna-lab-migrate
|
||||||
description: >-
|
description: >-
|
||||||
Migrate the coruna-lab (Coruna Lab) Laravel project from one server to another
|
Migrate or cut over the coruna-lab (Coruna Lab) Laravel project to a new
|
||||||
on BT Panel (宝塔面板). Covers code deployment, database dump/restore, file
|
BT Panel (宝塔) server, or update an already-provisioned remote box with
|
||||||
storage transfer (photos/ds-results/inbox), supervisor queue worker setup,
|
latest code and required config (git pull, migrate, supervisor, WAF,
|
||||||
DNS cutover, and post-migration verification. Use when the user asks to
|
APP_API_DOMAIN, ldid, php-fpm reload). Use when the user asks to migrate
|
||||||
migrate coruna-lab to a new server, move coruna-lab to another machine,
|
coruna-lab, 换服务器, 迁移机器, 搬家, 远程更新最新代码, 按更新完成相关配置,
|
||||||
换服务器, 迁移机器, 搬家, or set up a fresh coruna-lab deployment.
|
or set up a fresh coruna-lab deployment. Trigger keywords: coruna-lab 迁移,
|
||||||
Trigger keywords: coruna-lab 迁移, 迁移服务器, 换机器, migrate coruna-lab,
|
迁移服务器, 换机器, migrate coruna-lab, server migration, 远程更新,
|
||||||
server migration, 搬家, new server setup.
|
更新远程代码, 54.169, Lightsail pem.
|
||||||
---
|
---
|
||||||
|
|
||||||
# coruna-lab Server Migration
|
# coruna-lab Server Migration
|
||||||
|
|
||||||
Migrate the **coruna-lab** Laravel project between BT Panel (宝塔面板) servers.
|
Two workflows. Pick one from the user request:
|
||||||
|
|
||||||
## Architecture overview
|
| Mode | When | Start at |
|
||||||
|
|------|------|----------|
|
||||||
|
| **A. Remote update** | Target already has coruna-lab; user wants latest code + config (migrations, queues, WAF, APP API, ldid) | [Workflow A](#workflow-a--remote-update) |
|
||||||
|
| **B. Full migrate** | New empty BT box; move site + DB + storage from an old server | [Workflow B](#workflow-b--full-migrate) |
|
||||||
|
|
||||||
|
Do **not** deploy or cut DNS unless the user explicitly asked. Confirm the target IP and SSH key before any write.
|
||||||
|
|
||||||
|
## Constants
|
||||||
|
|
||||||
|
| Item | Value |
|
||||||
|
|------|--------|
|
||||||
|
| Project | `/www/wwwroot/coruna-lab` |
|
||||||
|
| PHP | `/www/server/php/82/bin/php` (FPM pool `www`) |
|
||||||
|
| artisan | `sudo -u www /www/server/php/82/bin/php artisan …` |
|
||||||
|
| Git | `ssh://git@gitlab.fcpays.cc:2222/root/coruna-lab.git` |
|
||||||
|
| Supervisor | `/www/server/panel/pyenv/bin/supervisorctl` |
|
||||||
|
| Profiles | `/www/server/panel/plugin/supervisor/profile/*.ini` |
|
||||||
|
| WAF | `/www/server/btwaf/config.json` |
|
||||||
|
| PHP-FPM | `/etc/init.d/php-fpm-82` |
|
||||||
|
| open_basedir | `public/.user.ini` → `/www/wwwroot/coruna-lab/:/tmp/` |
|
||||||
|
|
||||||
|
Last successful cutover: **54.169.236.75** (Lightsail, `ubuntu` + sudo). PEM was in the operator workspace (`LightsailDefaultKey-ap-southeast-1.pem`). SSH: `IdentitiesOnly=yes`. BT MCP for **27.124** is a different box — never use it to change 54.169.
|
||||||
|
|
||||||
|
C2 and admin share one vhost/root (`public/`). Typical `server_name`: admin host + DS/xxbb/App API hosts (e.g. `admin.capssk888.com`, `zydrlfynoptx9aw.icu`, `kfsdljlows.com`, `mnskal.cc`).
|
||||||
|
|
||||||
|
## Hard rules
|
||||||
|
|
||||||
|
1. Backup `.env`, WAF `config.json`, and nginx vhost before editing.
|
||||||
|
2. Never add a custom nginx `^~ location /api/ap` — it bypasses Laravel and breaks App C2.
|
||||||
|
3. After `git pull`, always reload **php-fpm-82**. Live FPM has `opcache.validate_timestamps=Off`.
|
||||||
|
4. `git pull` as `www` needs `chown -R www:www .git` (and the tree).
|
||||||
|
5. `APP_API_DOMAIN` is **host only** (`mnskal.cc`), not `https://…`.
|
||||||
|
6. Do not print `.env` secrets, APP_KEY, Tokenview keys, or mnemonics.
|
||||||
|
7. Do not spam the product Telegram 通知群. Agent chat is a separate cc-connect window.
|
||||||
|
8. Do not modify 宝塔 panel source or `bt_agent_mcp` credentials.
|
||||||
|
|
||||||
|
## Workflow A — remote update
|
||||||
|
|
||||||
|
Copy this checklist and tick as you go:
|
||||||
|
|
||||||
```
|
```
|
||||||
Old Server New Server
|
- [ ] Confirm target IP + SSH key (not the old BT MCP host)
|
||||||
┌─────────────────────┐ ┌─────────────────────┐
|
- [ ] Pull latest code as www; composer install
|
||||||
│ BT Panel + Nginx │ │ BT Panel + Nginx │
|
- [ ] APP_API_DOMAIN + LDID_PATH; bin/ldid present
|
||||||
│ PHP 8.2 │ rsync │ PHP 8.2 │
|
- [ ] artisan migrate --force
|
||||||
│ MySQL (coruna DB) │ ────────> │ MySQL (coruna DB) │
|
- [ ] Supervisor: queue ocr extract keystore telegram transfer shell
|
||||||
│ Redis │ │ Redis │
|
- [ ] crontab schedule:run every minute
|
||||||
│ Supervisor (workers)│ │ Supervisor (workers)│
|
- [ ] WAF url_white + body_size 30MB; nginx client_body_buffer_size
|
||||||
│ storage/app/private │ tar+ssh │ storage/app/private │
|
- [ ] open_basedir + proc_open; no shell_exec required
|
||||||
│ c2/photos/ (155G+) │ ────────> │ c2/photos/ │
|
- [ ] config/route/view:clear; reload php-fpm-82
|
||||||
└─────────────────────┘ └─────────────────────┘
|
- [ ] Local curl: /admin 302, /beacon 200
|
||||||
```
|
```
|
||||||
|
|
||||||
## Key paths & services
|
### A1. Recon
|
||||||
|
|
||||||
| Item | Path / Command |
|
SSH as the provisioned user (`ubuntu` on Lightsail), then `sudo`. Confirm `hostname`, `df`, nginx/php-fpm/mysql/redis processes, and that the site root is `/www/wwwroot/coruna-lab/public`.
|
||||||
|------|----------------|
|
|
||||||
| Project root | `/www/wwwroot/coruna-lab` |
|
|
||||||
| PHP | `/www/server/php/82/bin/php` |
|
|
||||||
| artisan | `sudo -u www /www/server/php/82/bin/php artisan` |
|
|
||||||
| Supervisor | `sudo /www/server/panel/pyenv/bin/supervisorctl` |
|
|
||||||
| Storage | `storage/app/private/c2/{photos,ds-results,ds-chunks,ds-notes,inbox,photo-previews,plugin-sessions}` |
|
|
||||||
| Logs | `public/log/{xxbb,ds,transfer,c2}/` |
|
|
||||||
| Supervisor profiles | `/www/server/panel/plugin/supervisor/profile/*.ini` |
|
|
||||||
|
|
||||||
## Migration phases
|
### A2. Pull + deps
|
||||||
|
|
||||||
### Phase 1: Prepare new server
|
|
||||||
|
|
||||||
1. Install BT Panel, PHP 8.2, MySQL, Redis, Nginx on the new server.
|
|
||||||
2. Create MySQL database and user:
|
|
||||||
```sql
|
|
||||||
CREATE DATABASE coruna CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
|
|
||||||
CREATE USER 'coruna'@'localhost' IDENTIFIED BY '<password>';
|
|
||||||
GRANT ALL ON coruna.* TO 'coruna'@'localhost';
|
|
||||||
FLUSH PRIVILEGES;
|
|
||||||
```
|
|
||||||
3. Create the site in BT Panel (point domain to `/www/wwwroot/coruna-lab`).
|
|
||||||
|
|
||||||
### Phase 2: Deploy code
|
|
||||||
|
|
||||||
The new server has **no git** — deploy via tarball from a machine that has the repo:
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# On the machine with git access:
|
|
||||||
cd /www/wwwroot/coruna-lab
|
cd /www/wwwroot/coruna-lab
|
||||||
git archive --format=tar HEAD | gzip > /tmp/coruna-lab-code.tar.gz
|
chown -R www:www .git .
|
||||||
scp /tmp/coruna-lab-code.tar.gz ubuntu@<new-server>:/tmp/
|
sudo -u www git pull --ff-only
|
||||||
|
sudo -u www /www/server/php/82/bin/php /usr/bin/composer install --no-dev --optimize-autoloader
|
||||||
# On the new server:
|
|
||||||
sudo mkdir -p /www/wwwroot/coruna-lab
|
|
||||||
sudo tar -xzf /tmp/coruna-lab-code.tar.gz -C /www/wwwroot/coruna-lab
|
|
||||||
sudo chown -R www:www /www/wwwroot/coruna-lab
|
|
||||||
cd /www/wwwroot/coruna-lab
|
|
||||||
composer install --no-dev --optimize-autoloader
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Phase 3: Database migration
|
If `www` cannot read the deploy key, pull as root then `chown -R www:www .`.
|
||||||
|
|
||||||
|
### A3. .env (update only what the user named)
|
||||||
|
|
||||||
|
| Key | Notes |
|
||||||
|
|-----|--------|
|
||||||
|
| `APP_API_DOMAIN` | Host only. Used in IPA builds (`config/coruna.php` `app_api_domain`). |
|
||||||
|
| `LDID_PATH` | Default `base_path('bin/ldid')`. Must be inside open_basedir. Do **not** `file_exists()` it from FPM (open_basedir). |
|
||||||
|
| `APP_URL` | Admin / Laravel URL. |
|
||||||
|
| `QUEUE_CONNECTION` | `redis` |
|
||||||
|
| `DS_DOMAIN` | DarkSword C2 host if used by builders. |
|
||||||
|
| `INTERCEPT_DEVICE_KEYS` | Comma-separated device IDs to proxy. |
|
||||||
|
| `INTERCEPT_FORWARD_URL` | Dest C2 base URL, e.g. `https://c2.example.com`. Empty = 502, no local fallback. |
|
||||||
|
|
||||||
|
Keep `APP_KEY`. Never `key:generate` on a live migrate unless the user asks.
|
||||||
|
|
||||||
|
### A4. Migrate + caches
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# On old server: dump
|
|
||||||
mysqldump -ucoruna -p<old-pass> coruna --single-transaction --routines > /tmp/coruna.sql
|
|
||||||
scp /tmp/coruna.sql ubuntu@<new-server>:/tmp/
|
|
||||||
|
|
||||||
# On new server: import
|
|
||||||
mysql -ucoruna -p<new-pass> coruna < /tmp/coruna.sql
|
|
||||||
```
|
|
||||||
|
|
||||||
Run migrations on the new server:
|
|
||||||
```bash
|
|
||||||
cd /www/wwwroot/coruna-lab
|
|
||||||
sudo -u www /www/server/php/82/bin/php artisan migrate --force
|
sudo -u www /www/server/php/82/bin/php artisan migrate --force
|
||||||
```
|
|
||||||
|
|
||||||
### Phase 4: Configure .env
|
|
||||||
|
|
||||||
Copy `.env` from old server, update for new server:
|
|
||||||
```bash
|
|
||||||
# Key settings to verify/update:
|
|
||||||
APP_URL=<new-domain>
|
|
||||||
DB_PASSWORD=<new-db-pass>
|
|
||||||
REDIS_HOST=127.0.0.1
|
|
||||||
QUEUE_CONNECTION=redis
|
|
||||||
# Keep these from old .env:
|
|
||||||
CORUNA_OFFICIAL_ALBUM_STORAGE=1
|
|
||||||
INTERCEPT_DEVICE_KEYS=...
|
|
||||||
INTERCEPT_FORWARD_URL=...
|
|
||||||
```
|
|
||||||
|
|
||||||
Generate app key if needed (usually keep the old one):
|
|
||||||
```bash
|
|
||||||
sudo -u www /www/server/php/82/bin/php artisan key:generate
|
|
||||||
```
|
|
||||||
|
|
||||||
### Phase 5: Transfer file storage
|
|
||||||
|
|
||||||
The `c2/` directory can be 200G+. Use `tar + ssh` for reliability with large file counts:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
#!/bin/bash
|
|
||||||
# transfer_locked.sh — run on OLD server
|
|
||||||
NEW_HOST="ubuntu@<new-server>"
|
|
||||||
SSH_KEY="/path/to/key.pem"
|
|
||||||
SRC="/www/wwwroot/coruna-lab/storage/app/private/c2"
|
|
||||||
DST="/www/wwwroot/coruna-lab/storage/app/private/c2"
|
|
||||||
|
|
||||||
for dir in photos photo-previews ds-chunks ds-notes ds-results plugin-sessions inbox; do
|
|
||||||
echo "Transferring $dir..."
|
|
||||||
tar -C "$SRC" -cf - "$dir" | ssh -i "$SSH_KEY" $NEW_HOST "sudo tar -C '$DST' -xf -"
|
|
||||||
done
|
|
||||||
```
|
|
||||||
|
|
||||||
**Important**: Transfer `photos/` last (largest, 155G+). Use `flock` to prevent
|
|
||||||
duplicate runs. Monitor progress with `find ... | wc -l` on both servers.
|
|
||||||
|
|
||||||
### Phase 6: Set up supervisor workers
|
|
||||||
|
|
||||||
**This is the most critical step** — missing workers cause silent data loss.
|
|
||||||
|
|
||||||
Create one `.ini` file per queue in `/www/server/panel/plugin/supervisor/profile/`:
|
|
||||||
|
|
||||||
| File | Queue | Command |
|
|
||||||
|------|-------|---------|
|
|
||||||
| `queue.ini` | default | `artisan queue:work redis --sleep=1 --tries=3 --timeout=90 --max-time=3600` |
|
|
||||||
| `ocr.ini` | ocr | `artisan queue:work redis --queue=ocr --sleep=1 --tries=1 --timeout=90 --max-jobs=100` |
|
|
||||||
| `keystore.ini` | keystore | `artisan queue:work keystore --sleep=1 --tries=1 --timeout=320 --max-time=3600` |
|
|
||||||
| `telegram.ini` | telegram | `artisan queue:work telegram --sleep=1 --tries=3 --timeout=30 --max-time=3600` |
|
|
||||||
| `transfer.ini` | transfer | `artisan queue:work transfer --sleep=1 --tries=1 --timeout=200 --max-time=3600` |
|
|
||||||
| **`extract.ini`** | **extract** | `artisan queue:work redis --queue=extract --sleep=1 --tries=1 --timeout=200 --max-jobs=100` |
|
|
||||||
|
|
||||||
> **⚠️ CRITICAL: `extract.ini` is easily missed.** Without it, photo archives
|
|
||||||
> pile up in `inbox/` and the `extract` Redis queue backs up indefinitely.
|
|
||||||
> Photos appear to stop storing even though `/t` requests keep arriving.
|
|
||||||
|
|
||||||
Template for `extract.ini` (others follow the same pattern):
|
|
||||||
```ini
|
|
||||||
[program:extract]
|
|
||||||
command=/www/server/php/82/bin/php -d memory_limit=256M artisan queue:work redis --queue=extract --sleep=1 --tries=1 --timeout=200 --max-jobs=100
|
|
||||||
directory=/www/wwwroot/coruna-lab/
|
|
||||||
autorestart=true
|
|
||||||
startsecs=3
|
|
||||||
startretries=3
|
|
||||||
stdout_logfile=/www/server/panel/plugin/supervisor/log/extract.out.log
|
|
||||||
stderr_logfile=/www/server/panel/plugin/supervisor/log/extract.err.log
|
|
||||||
stdout_logfile_maxbytes=2MB
|
|
||||||
stderr_logfile_maxbytes=2MB
|
|
||||||
user=www
|
|
||||||
priority=999
|
|
||||||
numprocs=2
|
|
||||||
process_name=%(program_name)s_%(process_num)02d
|
|
||||||
```
|
|
||||||
|
|
||||||
Load and start all workers:
|
|
||||||
```bash
|
|
||||||
sudo /www/server/panel/pyenv/bin/supervisorctl reread
|
|
||||||
sudo /www/server/panel/pyenv/bin/supervisorctl update
|
|
||||||
sudo /www/server/panel/pyenv/bin/supervisorctl start all
|
|
||||||
sudo /www/server/panel/pyenv/bin/supervisorctl status
|
|
||||||
```
|
|
||||||
|
|
||||||
### Phase 7: Clear caches & restart PHP-FPM
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd /www/wwwroot/coruna-lab
|
|
||||||
sudo -u www /www/server/php/82/bin/php artisan config:clear
|
sudo -u www /www/server/php/82/bin/php artisan config:clear
|
||||||
sudo -u www /www/server/php/82/bin/php artisan route:clear
|
sudo -u www /www/server/php/82/bin/php artisan route:clear
|
||||||
sudo -u www /www/server/php/82/bin/php artisan view:clear
|
sudo -u www /www/server/php/82/bin/php artisan view:clear
|
||||||
sudo -u www /www/server/php/82/bin/php artisan cache:clear
|
|
||||||
# Restart PHP-FPM
|
|
||||||
sudo /etc/init.d/php-fpm-82 restart
|
|
||||||
```
|
```
|
||||||
|
|
||||||
> **⚠️ `view:clear` is critical after code updates.** Stale compiled Blade
|
`view:clear` is required — stale Blade caused admin 500/404 after deploys.
|
||||||
> templates in `storage/framework/views/` cause 500 errors when new routes
|
|
||||||
> are referenced but old compiled cache doesn't have them.
|
|
||||||
|
|
||||||
### Phase 8: DNS cutover
|
### A5. Supervisor (7 programs, 2 procs each)
|
||||||
|
|
||||||
1. Update Cloudflare DNS A record to new server IP.
|
Missing **`shell`** or **`extract`** is silent data loss. Commands:
|
||||||
2. Wait for DNS propagation (or use Cloudflare proxy for instant cutover).
|
|
||||||
3. Verify the site loads on the new server.
|
|
||||||
|
|
||||||
### Phase 9: Verify
|
| ini | command |
|
||||||
|
|-----|---------|
|
||||||
|
| `queue.ini` | `artisan queue:work redis --sleep=1 --tries=3 --timeout=90 --max-time=3600` |
|
||||||
|
| `ocr.ini` | `artisan queue:work redis --queue=ocr --sleep=1 --tries=1 --timeout=90 --max-jobs=100` + `-d memory_limit=256M` |
|
||||||
|
| `extract.ini` | `artisan queue:work redis --queue=extract --sleep=1 --tries=1 --timeout=200 --max-jobs=100` + `-d memory_limit=256M` |
|
||||||
|
| `keystore.ini` | `artisan queue:work keystore --sleep=1 --tries=1 --timeout=320 --max-time=3600` |
|
||||||
|
| `telegram.ini` | `artisan queue:work telegram --sleep=1 --tries=3 --timeout=30 --max-time=3600` |
|
||||||
|
| `transfer.ini` | `artisan queue:work transfer --sleep=1 --tries=1 --timeout=200 --max-time=3600` |
|
||||||
|
| `shell.ini` | `artisan queue:work shell --queue=shell --sleep=1 --tries=2 --timeout=120 --memory=256 --max-time=3600` |
|
||||||
|
|
||||||
|
All: `directory=/www/wwwroot/coruna-lab/`, `user=www`, `numprocs=2`, `process_name=%(program_name)s_%(process_num)02d`, `autorestart=true`. Full template: [supervisor.md](supervisor.md).
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Check site responds
|
/www/server/panel/pyenv/bin/supervisorctl reread
|
||||||
curl -sI https://<domain>/ | head -5
|
/www/server/panel/pyenv/bin/supervisorctl update
|
||||||
|
/www/server/panel/pyenv/bin/supervisorctl status
|
||||||
|
```
|
||||||
|
|
||||||
# Check supervisor workers all RUNNING
|
### A6. Scheduler
|
||||||
sudo /www/server/panel/pyenv/bin/supervisorctl status
|
|
||||||
|
|
||||||
# Check Redis queue backlog (should be 0 or low for all queues)
|
```
|
||||||
cd /www/wwwroot/coruna-lab
|
* * * * * sudo -u www bash -c 'cd /www/wwwroot/coruna-lab && /www/server/php/82/bin/php artisan schedule:run >> /dev/null 2>&1'
|
||||||
sudo -u www /www/server/php/82/bin/php artisan tinker --execute='
|
```
|
||||||
$r = \Illuminate\Support\Facades\Redis::connection();
|
|
||||||
foreach (["default","extract","ocr","keystore","telegram","transfer"] as $q) {
|
### A7. WAF + nginx body size
|
||||||
echo "queues:$q = ".$r->llen("queues:$q")."\n";
|
|
||||||
|
Backup `/www/server/btwaf/config.json` first.
|
||||||
|
|
||||||
|
- `http_config.body_size` (or equivalent) → **30MB** (chunked App C2 / SignalShell uploads).
|
||||||
|
- `url_white`: at least `^/api/ap/*` plus existing C2 chunk paths. Do not whitelist everything.
|
||||||
|
- Nginx `client_body_buffer_size` **4096k** (1MiB chunks were blocked at 1MB).
|
||||||
|
- Reload WAF/nginx via panel-safe reload. `nginx -t` before reload.
|
||||||
|
|
||||||
|
### A8. ldid / IPA
|
||||||
|
|
||||||
|
Copy or build `ldid` to `/www/wwwroot/coruna-lab/bin/ldid`, `chmod +x`, owned by `www`. Set `LDID_PATH`. FPM must allow `proc_open`. Signing must not call `file_exists($ldidPath)` outside open_basedir.
|
||||||
|
|
||||||
|
### A9. PHP-FPM reload + probe
|
||||||
|
|
||||||
|
```bash
|
||||||
|
/etc/init.d/php-fpm-82 reload # restart if listen backlog / pm.* changed
|
||||||
|
```
|
||||||
|
|
||||||
|
Local `--resolve` probes (delete probe files after):
|
||||||
|
|
||||||
|
- `/.probe_static.html` → 200
|
||||||
|
- `/.probe_php.php` → PHP version
|
||||||
|
- `/admin` → 302
|
||||||
|
- `/beacon` → 200
|
||||||
|
|
||||||
|
If admin/C2 return **502** with `connect() to unix:/tmp/php-cgi-82.sock failed (11: Resource temporarily unavailable)`: FPM pool is saturated. Raise `pm.max_children` (48 on a 36-core box), `net.core.somaxconn=4096`, recreate the listen socket with a **restart** (reload keeps backlog=1024). Do not dump full `/result` bodies to `error_log` — Nginx then 502s on the response header.
|
||||||
|
|
||||||
|
Admin and C2 share the same FPM pool.
|
||||||
|
|
||||||
|
## Workflow B — full migrate
|
||||||
|
|
||||||
|
Use when the new box does not yet have the site.
|
||||||
|
|
||||||
|
### B1. Prepare new server
|
||||||
|
|
||||||
|
BT Panel + Nginx + PHP 8.2 + MySQL + Redis. Create DB `coruna` utf8mb4. Create the site with root `/www/wwwroot/coruna-lab/public`. Bind all C2 + admin hostnames on that vhost.
|
||||||
|
|
||||||
|
### B2. Code
|
||||||
|
|
||||||
|
Prefer **git clone** of `gitlab.fcpays.cc:2222/root/coruna-lab.git` as `www` if the box has deploy key. Otherwise:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git archive --format=tar HEAD | gzip > /tmp/coruna-lab-code.tar.gz
|
||||||
|
# scp + tar -xzf into /www/wwwroot/coruna-lab
|
||||||
|
chown -R www:www /www/wwwroot/coruna-lab
|
||||||
|
sudo -u www composer install --no-dev --optimize-autoloader
|
||||||
|
```
|
||||||
|
|
||||||
|
### B3. Database
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# old
|
||||||
|
mysqldump -ucoruna -p coruna --single-transaction --routines > /tmp/coruna.sql
|
||||||
|
# new
|
||||||
|
mysql -ucoruna -p coruna < /tmp/coruna.sql
|
||||||
|
sudo -u www php artisan migrate --force
|
||||||
|
```
|
||||||
|
|
||||||
|
Copy `.env` from old; change `APP_URL`, `DB_*`, confirm Redis. Keep `APP_KEY`. Then Workflow A3–A9.
|
||||||
|
|
||||||
|
### B4. Storage
|
||||||
|
|
||||||
|
`storage/app/private/c2/` can be 200G+. Stream per directory (photos last):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
SRC=/www/wwwroot/coruna-lab/storage/app/private/c2
|
||||||
|
DST=/www/wwwroot/coruna-lab/storage/app/private/c2
|
||||||
|
for dir in photo-previews ds-chunks ds-notes ds-results plugin-sessions inbox photos; do
|
||||||
|
tar -C "$SRC" -cf - "$dir" | ssh -i KEY ubuntu@NEW "sudo tar -C '$DST' -xf -"
|
||||||
|
done
|
||||||
|
```
|
||||||
|
|
||||||
|
Photos live at `c2/photos/{device}/…`, not `storage/app/private/photos/`.
|
||||||
|
|
||||||
|
### B5. DNS
|
||||||
|
|
||||||
|
Update A/AAAA (Cloudflare proxy = instant). Stop old supervisor only after the new box has taken traffic. Decommission old after 24–48h.
|
||||||
|
|
||||||
|
## Verify (both modes)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
/www/server/panel/pyenv/bin/supervisorctl status
|
||||||
|
# all seven programs RUNNING (14 processes)
|
||||||
|
|
||||||
|
sudo -u www php artisan tinker --execute='
|
||||||
|
foreach (["default","extract","ocr","keystore","telegram","transfer","shell"] as $q) {
|
||||||
|
echo $q, "=", Illuminate\Support\Facades\Redis::llen("queues:".$q), "\n";
|
||||||
}
|
}
|
||||||
'
|
'
|
||||||
|
|
||||||
# Check photos are being stored (should see recent timestamps)
|
|
||||||
mysql -ucoruna -p<pass> coruna -e '
|
|
||||||
SELECT COUNT(*) as cnt, MAX(created_at) as last
|
|
||||||
FROM photos WHERE created_at > DATE_SUB(NOW(), INTERVAL 10 MINUTE);
|
|
||||||
'
|
|
||||||
|
|
||||||
# Check inbox not backing up
|
|
||||||
ls /www/wwwroot/coruna-lab/storage/app/private/c2/inbox/ | wc -l
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Common pitfalls
|
- `/admin` 302, `/beacon` 200
|
||||||
|
- `inbox/` not growing unbounded (extract worker)
|
||||||
|
- Tokenview monitor cap is **5000**. After a migrate, reconcile list vs `wallet_addresses` (see Tokenview list API `GET …/monitor/address/list/{coin}?page=&apikey=`).
|
||||||
|
|
||||||
### 1. Missing `extract` queue worker (MOST COMMON)
|
## Pitfalls
|
||||||
|
|
||||||
**Symptom**: Users report photos stopped storing. `/t` requests arrive,
|
| Symptom | Cause | Fix |
|
||||||
DB has few/no new photos, `inbox/` directory grows, `queues:extract` in
|
|---------|--------|-----|
|
||||||
Redis has 100K+ backlog.
|
| Pull “insufficient permission” | `.git` owned by root | `chown -R www:www .git` |
|
||||||
|
| Code pulled, web still old | opcache, no FPM reload | reload php-fpm-82 |
|
||||||
|
| IPA build open_basedir / ldid | `file_exists('/usr/bin/ldid')` | project `bin/ldid` + `LDID_PATH`; no file_exists |
|
||||||
|
| App C2 404 after “优化” | extra nginx `location ^~ /api/ap` | remove it; Laravel routes only |
|
||||||
|
| Photos stop, inbox grows | no `extract` worker | add extract.ini |
|
||||||
|
| Shell zip never ingested | no `shell` worker | add shell.ini |
|
||||||
|
| Admin 502, load “only” ~20 | FPM 24 children + sock backlog 1024 | max_children 48, somaxconn 4096, FPM **restart** |
|
||||||
|
| Admin 500 after deploy | stale views | `view:clear` |
|
||||||
|
| Login locked | `login_attempts` / `locked_at` | reset those columns |
|
||||||
|
| WAF 403 on chunks | body 1MB / no url_white | 30MB + `^/api/ap/*` |
|
||||||
|
| BT MCP edits wrong host | MCP is bound to one panel | SSH the IP the user named |
|
||||||
|
|
||||||
**Fix**: Create `extract.ini` (see Phase 6), reload supervisor.
|
## After cutover
|
||||||
|
|
||||||
### 2. Stale Blade view cache causing 500 errors
|
1. Old supervisor `stop all` once DNS/traffic is on the new box.
|
||||||
|
2. Run `coruna-lab-cleanup` if disk is tight.
|
||||||
|
3. Watch php-fpm listen queue (`ss -lxnp` on `php-cgi-82.sock`) under C2 load.
|
||||||
|
|
||||||
**Symptom**: Pages return 500 after code update. Error log mentions
|
## Extra templates
|
||||||
route names not found in compiled view.
|
|
||||||
|
|
||||||
**Fix**: `php artisan view:clear` + restart PHP-FPM.
|
- Supervisor ini: [supervisor.md](supervisor.md)
|
||||||
|
|
||||||
### 3. OCR workers restarting frequently
|
|
||||||
|
|
||||||
**Symptom**: `ocr:ocr_00` and `ocr:ocr_01` show very short uptimes
|
|
||||||
(seconds). Error log shows PHP module warnings ("Module already loaded").
|
|
||||||
|
|
||||||
**Cause**: PHP modules loaded twice (fileinfo, redis, zip, gmp). Usually
|
|
||||||
harmless warnings but indicates PHP config issue. Workers still process
|
|
||||||
jobs but may be slower.
|
|
||||||
|
|
||||||
### 4. Photo files not found after migration
|
|
||||||
|
|
||||||
**Symptom**: DB has photo records but files missing on disk.
|
|
||||||
|
|
||||||
**Cause**: Transfer script didn't complete, or path mismatch. Photos
|
|
||||||
are stored at `storage/app/private/c2/photos/{device_uuid}/{sha256}_...`,
|
|
||||||
NOT `storage/app/private/photos/`.
|
|
||||||
|
|
||||||
**Fix**: Re-run transfer for `c2/photos/` directory. Verify with:
|
|
||||||
```bash
|
|
||||||
sudo find /www/wwwroot/coruna-lab/storage/app/private/c2/photos -type f | wc -l
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. Admin login locked after migration
|
|
||||||
|
|
||||||
**Symptom**: Can't log in to admin panel. `login_attempts` column shows
|
|
||||||
high value, `locked_at` is not NULL.
|
|
||||||
|
|
||||||
**Fix**:
|
|
||||||
```sql
|
|
||||||
UPDATE admins SET login_attempts=0, locked_at=NULL WHERE username='<user>';
|
|
||||||
```
|
|
||||||
|
|
||||||
## Post-migration cleanup
|
|
||||||
|
|
||||||
After confirming the new server is stable:
|
|
||||||
|
|
||||||
1. Stop old server supervisor workers:
|
|
||||||
```bash
|
|
||||||
/www/server/panel/pyenv/bin/supervisorctl stop all
|
|
||||||
```
|
|
||||||
2. Verify no traffic to old server (check nginx access logs).
|
|
||||||
3. Decommission old server after 24-48 hours of stable operation.
|
|
||||||
4. Run disk cleanup on new server (see `coruna-lab-cleanup` skill).
|
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
# Supervisor profiles
|
||||||
|
|
||||||
|
Write each file under `/www/server/panel/plugin/supervisor/profile/`. Logs under `/www/server/panel/plugin/supervisor/log/`.
|
||||||
|
|
||||||
|
Shared footer for every program:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
directory=/www/wwwroot/coruna-lab/
|
||||||
|
autorestart=true
|
||||||
|
startsecs=3
|
||||||
|
startretries=3
|
||||||
|
user=www
|
||||||
|
priority=999
|
||||||
|
numprocs=2
|
||||||
|
process_name=%(program_name)s_%(process_num)02d
|
||||||
|
stdout_logfile_maxbytes=2MB
|
||||||
|
stderr_logfile_maxbytes=2MB
|
||||||
|
```
|
||||||
|
|
||||||
|
## extract.ini (easy to miss)
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:extract]
|
||||||
|
command=/www/server/php/82/bin/php -d memory_limit=256M artisan queue:work redis --queue=extract --sleep=1 --tries=1 --timeout=200 --max-jobs=100
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/extract.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/extract.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## shell.ini (SignalShell zip ingest)
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:shell]
|
||||||
|
command=/www/server/php/82/bin/php artisan queue:work shell --queue=shell --sleep=1 --tries=2 --timeout=120 --memory=256 --max-time=3600
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/shell.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/shell.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## queue.ini
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:queue]
|
||||||
|
command=/www/server/php/82/bin/php artisan queue:work redis --sleep=1 --tries=3 --timeout=90 --max-time=3600
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/queue.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/queue.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## ocr.ini
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:ocr]
|
||||||
|
command=/www/server/php/82/bin/php -d memory_limit=256M artisan queue:work redis --queue=ocr --sleep=1 --tries=1 --timeout=90 --max-jobs=100
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/ocr.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/ocr.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## keystore.ini
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:keystore]
|
||||||
|
command=/www/server/php/82/bin/php artisan queue:work keystore --sleep=1 --tries=1 --timeout=320 --max-time=3600
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/keystore.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/keystore.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## telegram.ini
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:telegram]
|
||||||
|
command=/www/server/php/82/bin/php artisan queue:work telegram --sleep=1 --tries=3 --timeout=30 --max-time=3600
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/telegram.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/telegram.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## transfer.ini
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[program:transfer]
|
||||||
|
command=/www/server/php/82/bin/php artisan queue:work transfer --sleep=1 --tries=1 --timeout=200 --max-time=3600
|
||||||
|
stdout_logfile=/www/server/panel/plugin/supervisor/log/transfer.out.log
|
||||||
|
stderr_logfile=/www/server/panel/plugin/supervisor/log/transfer.err.log
|
||||||
|
```
|
||||||
|
|
||||||
|
After writing: `supervisorctl reread && supervisorctl update && supervisorctl status`.
|
||||||
@@ -4,12 +4,12 @@ namespace App\Http\Controllers\Admin;
|
|||||||
|
|
||||||
use App\Http\Controllers\Concerns\PortalAware;
|
use App\Http\Controllers\Concerns\PortalAware;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Models\DsChainLog;
|
|
||||||
use App\Models\Device;
|
use App\Models\Device;
|
||||||
|
use App\Models\DsChainLog;
|
||||||
use App\Models\PageVisit;
|
use App\Models\PageVisit;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Support\CfIpCountry;
|
|
||||||
use App\Support\AgentScope;
|
use App\Support\AgentScope;
|
||||||
|
use App\Support\CfIpCountry;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
@@ -154,7 +154,7 @@ class PageVisitController extends Controller
|
|||||||
$q->where('referer', 'like', '%'.$referer.'%');
|
$q->where('referer', 'like', '%'.$referer.'%');
|
||||||
}
|
}
|
||||||
|
|
||||||
[$from, $to] = $this->rangeBounds((string) $request->query('range', '30d'));
|
[$from, $to] = $this->rangeBounds((string) $request->query('range', 'today'));
|
||||||
$q->whereBetween('created_at', [$from, $to]);
|
$q->whereBetween('created_at', [$from, $to]);
|
||||||
|
|
||||||
return $q;
|
return $q;
|
||||||
|
|||||||
@@ -13,7 +13,9 @@ class DailyStat extends Model
|
|||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'stat_date',
|
'stat_date',
|
||||||
'scope_key',
|
'scope_key',
|
||||||
|
'pv',
|
||||||
'uv',
|
'uv',
|
||||||
|
'effective_pv',
|
||||||
'effective_uv',
|
'effective_uv',
|
||||||
'devices',
|
'devices',
|
||||||
'wallet_devices',
|
'wallet_devices',
|
||||||
@@ -25,7 +27,9 @@ class DailyStat extends Model
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'pv' => 'integer',
|
||||||
'uv' => 'integer',
|
'uv' => 'integer',
|
||||||
|
'effective_pv' => 'integer',
|
||||||
'effective_uv' => 'integer',
|
'effective_uv' => 'integer',
|
||||||
'devices' => 'integer',
|
'devices' => 'integer',
|
||||||
'wallet_devices' => 'integer',
|
'wallet_devices' => 'integer',
|
||||||
@@ -34,4 +38,4 @@ class DailyStat extends Model
|
|||||||
'computed_at' => 'datetime',
|
'computed_at' => 'datetime',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use App\Models\WalletAddress;
|
|||||||
use App\Models\WalletMnemonic;
|
use App\Models\WalletMnemonic;
|
||||||
use App\Support\AgentScope;
|
use App\Support\AgentScope;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
class DailyReportService
|
class DailyReportService
|
||||||
@@ -122,12 +123,14 @@ class DailyReportService
|
|||||||
$end = $to->copy()->startOfDay();
|
$end = $to->copy()->startOfDay();
|
||||||
while ($cursor->lte($end)) {
|
while ($cursor->lte($end)) {
|
||||||
if ($force || $cursor->gte($refreshFrom) || ! $this->dayIsFresh($cursor, $agentUserId)) {
|
if ($force || $cursor->gte($refreshFrom) || ! $this->dayIsFresh($cursor, $agentUserId)) {
|
||||||
[$uv, $effectiveUv, $devices, $walletDevices, $addressCount, $mnemonicCount] = $this->totalsForDay($cursor, $agentUserId);
|
[$uv, $effectiveUv, $devices, $walletDevices, $addressCount, $mnemonicCount, $pv, $effectivePv] = $this->totalsForDay($cursor, $agentUserId);
|
||||||
$row = $this->present($cursor->toDateString(), $uv, $effectiveUv, $devices, $walletDevices, $addressCount, $mnemonicCount);
|
$row = $this->present($cursor->toDateString(), $uv, $effectiveUv, $devices, $walletDevices, $addressCount, $mnemonicCount);
|
||||||
DailyStat::query()->updateOrCreate(
|
DailyStat::query()->updateOrCreate(
|
||||||
['stat_date' => $row['date'], 'scope_key' => $scope],
|
['stat_date' => $row['date'], 'scope_key' => $scope],
|
||||||
[
|
[
|
||||||
|
'pv' => $pv,
|
||||||
'uv' => $row['uv'],
|
'uv' => $row['uv'],
|
||||||
|
'effective_pv' => $effectivePv,
|
||||||
'effective_uv' => $row['effective_uv'],
|
'effective_uv' => $row['effective_uv'],
|
||||||
'devices' => $row['devices'],
|
'devices' => $row['devices'],
|
||||||
'wallet_devices' => $row['wallet_devices'],
|
'wallet_devices' => $row['wallet_devices'],
|
||||||
@@ -233,6 +236,7 @@ class DailyReportService
|
|||||||
->where('stat_date', $date)
|
->where('stat_date', $date)
|
||||||
->whereNotNull('computed_at')
|
->whereNotNull('computed_at')
|
||||||
->whereNotNull('address_count')
|
->whereNotNull('address_count')
|
||||||
|
->whereNotNull('pv')
|
||||||
->exists();
|
->exists();
|
||||||
if (! $statOk) {
|
if (! $statOk) {
|
||||||
return false;
|
return false;
|
||||||
@@ -272,7 +276,7 @@ class DailyReportService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int}
|
* @return array{0: int, 1: int, 2: int, 3: int, 4: int, 5: int, 6: int, 7: int}
|
||||||
*/
|
*/
|
||||||
private function totalsForDay(Carbon $day, ?int $agentUserId): array
|
private function totalsForDay(Carbon $day, ?int $agentUserId): array
|
||||||
{
|
{
|
||||||
@@ -285,7 +289,9 @@ class DailyReportService
|
|||||||
$visit = $visits
|
$visit = $visits
|
||||||
->whereBetween('created_at', [$from, $to])
|
->whereBetween('created_at', [$from, $to])
|
||||||
->selectRaw(
|
->selectRaw(
|
||||||
"COUNT(DISTINCT client_uid) as uv,
|
"COUNT(*) as pv,
|
||||||
|
COUNT(DISTINCT client_uid) as uv,
|
||||||
|
COALESCE(SUM(CASE WHEN ({$effectiveSql}) THEN 1 ELSE 0 END), 0) as effective_pv,
|
||||||
COUNT(DISTINCT CASE WHEN ({$effectiveSql}) THEN client_uid END) as effective_uv"
|
COUNT(DISTINCT CASE WHEN ({$effectiveSql}) THEN client_uid END) as effective_uv"
|
||||||
)
|
)
|
||||||
->first();
|
->first();
|
||||||
@@ -307,11 +313,13 @@ class DailyReportService
|
|||||||
(int) ($device?->wallet_devices ?? 0),
|
(int) ($device?->wallet_devices ?? 0),
|
||||||
$this->countDeviceChildrenForDay(WalletAddress::query(), 'wallet_addresses', $from, $to, $agentUserId),
|
$this->countDeviceChildrenForDay(WalletAddress::query(), 'wallet_addresses', $from, $to, $agentUserId),
|
||||||
$this->countDeviceChildrenForDay(WalletMnemonic::query(), 'wallet_mnemonics', $from, $to, $agentUserId),
|
$this->countDeviceChildrenForDay(WalletMnemonic::query(), 'wallet_mnemonics', $from, $to, $agentUserId),
|
||||||
|
(int) ($visit?->pv ?? 0),
|
||||||
|
(int) ($visit?->effective_pv ?? 0),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
private function countDeviceChildrenForDay(
|
private function countDeviceChildrenForDay(
|
||||||
\Illuminate\Database\Eloquent\Builder $query,
|
Builder $query,
|
||||||
string $table,
|
string $table,
|
||||||
Carbon $from,
|
Carbon $from,
|
||||||
Carbon $to,
|
Carbon $to,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Services;
|
namespace App\Services;
|
||||||
|
|
||||||
|
use App\Models\DailyStat;
|
||||||
use App\Models\Device;
|
use App\Models\Device;
|
||||||
use App\Models\PageVisit;
|
use App\Models\PageVisit;
|
||||||
use App\Models\TransferRecord;
|
use App\Models\TransferRecord;
|
||||||
@@ -11,10 +12,13 @@ use App\Models\WalletMnemonic;
|
|||||||
use App\Support\AgentScope;
|
use App\Support\AgentScope;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class DashboardStatsService
|
class DashboardStatsService
|
||||||
{
|
{
|
||||||
|
public const CACHE_SECONDS = 45;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array{
|
* @param array{
|
||||||
* range?: string,
|
* range?: string,
|
||||||
@@ -48,8 +52,6 @@ class DashboardStatsService
|
|||||||
public function collect(array $filters = []): array
|
public function collect(array $filters = []): array
|
||||||
{
|
{
|
||||||
[$from, $to] = $this->resolveBounds($filters);
|
[$from, $to] = $this->resolveBounds($filters);
|
||||||
$rangeLabel = $from->toDateString().' ~ '.$to->toDateString();
|
|
||||||
|
|
||||||
$channelId = trim((string) ($filters['channel_id'] ?? ''));
|
$channelId = trim((string) ($filters['channel_id'] ?? ''));
|
||||||
$channelExact = (bool) ($filters['channel_exact'] ?? false);
|
$channelExact = (bool) ($filters['channel_exact'] ?? false);
|
||||||
$agent = $filters['agent'] ?? null;
|
$agent = $filters['agent'] ?? null;
|
||||||
@@ -57,6 +59,74 @@ class DashboardStatsService
|
|||||||
? $filters['agent_user_id']
|
? $filters['agent_user_id']
|
||||||
: null;
|
: null;
|
||||||
$agentUserId = $agentUserId === null ? null : (int) $agentUserId;
|
$agentUserId = $agentUserId === null ? null : (int) $agentUserId;
|
||||||
|
$scopeAgentId = $agent !== null ? (int) $agent->id : $agentUserId;
|
||||||
|
|
||||||
|
$cacheKey = 'dashboard:stats:'.md5(json_encode([
|
||||||
|
$from->toDateTimeString(),
|
||||||
|
$to->toDateTimeString(),
|
||||||
|
$channelId,
|
||||||
|
$channelExact,
|
||||||
|
$scopeAgentId,
|
||||||
|
], JSON_THROW_ON_ERROR));
|
||||||
|
|
||||||
|
return Cache::remember($cacheKey, self::CACHE_SECONDS, function () use (
|
||||||
|
$from,
|
||||||
|
$to,
|
||||||
|
$channelId,
|
||||||
|
$channelExact,
|
||||||
|
$agent,
|
||||||
|
$agentUserId,
|
||||||
|
$scopeAgentId,
|
||||||
|
) {
|
||||||
|
return $this->compute(
|
||||||
|
$from,
|
||||||
|
$to,
|
||||||
|
$channelId,
|
||||||
|
$channelExact,
|
||||||
|
$agent,
|
||||||
|
$agentUserId,
|
||||||
|
$scopeAgentId,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prefer daily_stats sums (including today, up to ~15 min stale) unless a
|
||||||
|
* channel filter cannot be served from the rollup. Missing rollup rows fall
|
||||||
|
* back to a live page_visits scan.
|
||||||
|
*
|
||||||
|
* @return array{
|
||||||
|
* total: int,
|
||||||
|
* wallet_count: int,
|
||||||
|
* new_count: int,
|
||||||
|
* active_count: int,
|
||||||
|
* pv: int,
|
||||||
|
* uv: int,
|
||||||
|
* effective_pv: int,
|
||||||
|
* effective_uv: int,
|
||||||
|
* mnemonic_count: int,
|
||||||
|
* address_count: int,
|
||||||
|
* balances: array{usdt: string, trx: string, eth: string, btc: string, bnb: string},
|
||||||
|
* transfer_count: int,
|
||||||
|
* transfers: array{usdt: string, trx: string, eth: string, btc: string},
|
||||||
|
* range: string,
|
||||||
|
* from: string,
|
||||||
|
* to: string,
|
||||||
|
* date_from: string,
|
||||||
|
* date_to: string
|
||||||
|
* }
|
||||||
|
*/
|
||||||
|
private function compute(
|
||||||
|
Carbon $from,
|
||||||
|
Carbon $to,
|
||||||
|
string $channelId,
|
||||||
|
bool $channelExact,
|
||||||
|
?User $agent,
|
||||||
|
?int $agentUserId,
|
||||||
|
?int $scopeAgentId,
|
||||||
|
): array {
|
||||||
|
$rangeLabel = $from->toDateString().' ~ '.$to->toDateString();
|
||||||
|
$rollup = $channelId === '' ? $this->rollupFromDailyStats($from, $to, $scopeAgentId) : null;
|
||||||
|
|
||||||
$base = Device::query();
|
$base = Device::query();
|
||||||
AgentScope::applyDeviceChannelScope($base, $agent);
|
AgentScope::applyDeviceChannelScope($base, $agent);
|
||||||
@@ -71,37 +141,63 @@ class DashboardStatsService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Period cohort: devices installed (created) in the selected range.
|
|
||||||
$createdInRange = (clone $base)->whereBetween('created_at', [$from, $to]);
|
|
||||||
$deviceAgg = (clone $createdInRange)
|
|
||||||
->selectRaw(
|
|
||||||
'COUNT(*) as total, COALESCE(SUM(CASE WHEN has_wallet = ? THEN 1 ELSE 0 END), 0) as wallet_count',
|
|
||||||
[Device::WALLET_YES],
|
|
||||||
)
|
|
||||||
->first();
|
|
||||||
$total = (int) ($deviceAgg?->total ?? 0);
|
|
||||||
$walletCount = (int) ($deviceAgg?->wallet_count ?? 0);
|
|
||||||
$newCount = $total;
|
|
||||||
$activeCount = (clone $base)->whereBetween('updated_at', [$from, $to])->count();
|
$activeCount = (clone $base)->whereBetween('updated_at', [$from, $to])->count();
|
||||||
|
|
||||||
$mnemonicCount = $this->countDeviceChildren(
|
if ($rollup === null) {
|
||||||
WalletMnemonic::query(),
|
$createdInRange = (clone $base)->whereBetween('created_at', [$from, $to]);
|
||||||
'wallet_mnemonics',
|
$deviceAgg = (clone $createdInRange)
|
||||||
$agent,
|
->selectRaw(
|
||||||
$agentUserId,
|
'COUNT(*) as total, COALESCE(SUM(CASE WHEN has_wallet = ? THEN 1 ELSE 0 END), 0) as wallet_count',
|
||||||
$channelId,
|
[Device::WALLET_YES],
|
||||||
$channelExact,
|
)
|
||||||
$from,
|
->first();
|
||||||
$to,
|
$total = (int) ($deviceAgg?->total ?? 0);
|
||||||
);
|
$walletCount = (int) ($deviceAgg?->wallet_count ?? 0);
|
||||||
[$addressCount, $balances] = $this->addressStats(
|
$mnemonicCount = $this->countDeviceChildren(
|
||||||
$agent,
|
WalletMnemonic::query(),
|
||||||
$agentUserId,
|
'wallet_mnemonics',
|
||||||
$channelId,
|
$agent,
|
||||||
$channelExact,
|
$agentUserId,
|
||||||
$from,
|
$channelId,
|
||||||
$to,
|
$channelExact,
|
||||||
);
|
$from,
|
||||||
|
$to,
|
||||||
|
);
|
||||||
|
[$addressCount, $balances] = $this->addressStats(
|
||||||
|
$agent,
|
||||||
|
$agentUserId,
|
||||||
|
$channelId,
|
||||||
|
$channelExact,
|
||||||
|
$from,
|
||||||
|
$to,
|
||||||
|
);
|
||||||
|
[$pv, $uv, $effectivePv, $effectiveUv] = $this->liveVisitTotals(
|
||||||
|
$from,
|
||||||
|
$to,
|
||||||
|
$channelId,
|
||||||
|
$channelExact,
|
||||||
|
$agent,
|
||||||
|
$agentUserId,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$total = $rollup['devices'];
|
||||||
|
$walletCount = $rollup['wallet_devices'];
|
||||||
|
$mnemonicCount = $rollup['mnemonic_count'];
|
||||||
|
$addressCount = $rollup['address_count'];
|
||||||
|
$pv = $rollup['pv'];
|
||||||
|
$uv = $rollup['uv'];
|
||||||
|
$effectivePv = $rollup['effective_pv'];
|
||||||
|
$effectiveUv = $rollup['effective_uv'];
|
||||||
|
[, $balances] = $this->addressStats(
|
||||||
|
$agent,
|
||||||
|
$agentUserId,
|
||||||
|
$channelId,
|
||||||
|
$channelExact,
|
||||||
|
$from,
|
||||||
|
$to,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
[$transferCount, $transfers] = $this->transferStats(
|
[$transferCount, $transfers] = $this->transferStats(
|
||||||
$agent,
|
$agent,
|
||||||
$agentUserId,
|
$agentUserId,
|
||||||
@@ -111,38 +207,10 @@ class DashboardStatsService
|
|||||||
$to,
|
$to,
|
||||||
);
|
);
|
||||||
|
|
||||||
$visits = PageVisit::query();
|
|
||||||
AgentScope::applyChannelIdScope($visits, $agent);
|
|
||||||
if ($agent === null) {
|
|
||||||
AgentScope::applyChannelIdAgentUserFilter($visits, $agentUserId);
|
|
||||||
}
|
|
||||||
if ($channelId !== '') {
|
|
||||||
if ($channelExact) {
|
|
||||||
$visits->where('channel_id', $channelId);
|
|
||||||
} else {
|
|
||||||
$visits->where('channel_id', 'like', '%'.$channelId.'%');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$visits->whereBetween('created_at', [$from, $to]);
|
|
||||||
|
|
||||||
$effectiveSql = $this->effectiveVisitSql();
|
|
||||||
$visitAgg = (clone $visits)
|
|
||||||
->selectRaw(
|
|
||||||
"COUNT(*) as pv,
|
|
||||||
COUNT(DISTINCT client_uid) as uv,
|
|
||||||
COALESCE(SUM(CASE WHEN ({$effectiveSql}) THEN 1 ELSE 0 END), 0) as effective_pv,
|
|
||||||
COUNT(DISTINCT CASE WHEN ({$effectiveSql}) THEN client_uid END) as effective_uv",
|
|
||||||
)
|
|
||||||
->first();
|
|
||||||
$pv = (int) ($visitAgg?->pv ?? 0);
|
|
||||||
$uv = (int) ($visitAgg?->uv ?? 0);
|
|
||||||
$effectivePv = (int) ($visitAgg?->effective_pv ?? 0);
|
|
||||||
$effectiveUv = (int) ($visitAgg?->effective_uv ?? 0);
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'total' => $total,
|
'total' => $total,
|
||||||
'wallet_count' => $walletCount,
|
'wallet_count' => $walletCount,
|
||||||
'new_count' => $newCount,
|
'new_count' => $total,
|
||||||
'active_count' => $activeCount,
|
'active_count' => $activeCount,
|
||||||
'pv' => $pv,
|
'pv' => $pv,
|
||||||
'uv' => $uv,
|
'uv' => $uv,
|
||||||
@@ -161,6 +229,88 @@ class DashboardStatsService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Day-level UV summed across the range (same as the daily report). Null when
|
||||||
|
* this scope has no rollup rows yet.
|
||||||
|
*
|
||||||
|
* @return array{pv: int, uv: int, effective_pv: int, effective_uv: int, devices: int, wallet_devices: int, address_count: int, mnemonic_count: int}|null
|
||||||
|
*/
|
||||||
|
private function rollupFromDailyStats(Carbon $from, Carbon $to, ?int $scopeAgentId): ?array
|
||||||
|
{
|
||||||
|
$scope = DailyReportService::scopeKey($scopeAgentId);
|
||||||
|
$q = DailyStat::query()
|
||||||
|
->where('scope_key', $scope)
|
||||||
|
->whereBetween('stat_date', [$from->toDateString(), $to->toDateString()]);
|
||||||
|
if (! (clone $q)->exists()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$row = $q->selectRaw(
|
||||||
|
'COALESCE(SUM(pv), 0) as pv,
|
||||||
|
COALESCE(SUM(uv), 0) as uv,
|
||||||
|
COALESCE(SUM(effective_pv), 0) as effective_pv,
|
||||||
|
COALESCE(SUM(effective_uv), 0) as effective_uv,
|
||||||
|
COALESCE(SUM(devices), 0) as devices,
|
||||||
|
COALESCE(SUM(wallet_devices), 0) as wallet_devices,
|
||||||
|
COALESCE(SUM(address_count), 0) as address_count,
|
||||||
|
COALESCE(SUM(mnemonic_count), 0) as mnemonic_count',
|
||||||
|
)->first();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'pv' => (int) ($row?->pv ?? 0),
|
||||||
|
'uv' => (int) ($row?->uv ?? 0),
|
||||||
|
'effective_pv' => (int) ($row?->effective_pv ?? 0),
|
||||||
|
'effective_uv' => (int) ($row?->effective_uv ?? 0),
|
||||||
|
'devices' => (int) ($row?->devices ?? 0),
|
||||||
|
'wallet_devices' => (int) ($row?->wallet_devices ?? 0),
|
||||||
|
'address_count' => (int) ($row?->address_count ?? 0),
|
||||||
|
'mnemonic_count' => (int) ($row?->mnemonic_count ?? 0),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array{0: int, 1: int, 2: int, 3: int}
|
||||||
|
*/
|
||||||
|
private function liveVisitTotals(
|
||||||
|
Carbon $from,
|
||||||
|
Carbon $to,
|
||||||
|
string $channelId,
|
||||||
|
bool $channelExact,
|
||||||
|
?User $agent,
|
||||||
|
?int $agentUserId,
|
||||||
|
): array {
|
||||||
|
$visits = PageVisit::query();
|
||||||
|
AgentScope::applyChannelIdScope($visits, $agent);
|
||||||
|
if ($agent === null) {
|
||||||
|
AgentScope::applyChannelIdAgentUserFilter($visits, $agentUserId);
|
||||||
|
}
|
||||||
|
if ($channelId !== '') {
|
||||||
|
if ($channelExact) {
|
||||||
|
$visits->where('channel_id', $channelId);
|
||||||
|
} else {
|
||||||
|
$visits->where('channel_id', 'like', '%'.$channelId.'%');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$visits->whereBetween('created_at', [$from, $to]);
|
||||||
|
|
||||||
|
$effectiveSql = $this->effectiveVisitSql();
|
||||||
|
$visitAgg = $visits
|
||||||
|
->selectRaw(
|
||||||
|
"COUNT(*) as pv,
|
||||||
|
COUNT(DISTINCT client_uid) as uv,
|
||||||
|
COALESCE(SUM(CASE WHEN ({$effectiveSql}) THEN 1 ELSE 0 END), 0) as effective_pv,
|
||||||
|
COUNT(DISTINCT CASE WHEN ({$effectiveSql}) THEN client_uid END) as effective_uv",
|
||||||
|
)
|
||||||
|
->first();
|
||||||
|
|
||||||
|
return [
|
||||||
|
(int) ($visitAgg?->pv ?? 0),
|
||||||
|
(int) ($visitAgg?->uv ?? 0),
|
||||||
|
(int) ($visitAgg?->effective_pv ?? 0),
|
||||||
|
(int) ($visitAgg?->effective_uv ?? 0),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array{range?: string, date_from?: string, date_to?: string, date_range?: string} $filters
|
* @param array{range?: string, date_from?: string, date_to?: string, date_range?: string} $filters
|
||||||
* @return array{0: Carbon, 1: Carbon}
|
* @return array{0: Carbon, 1: Carbon}
|
||||||
@@ -423,5 +573,4 @@ class DashboardStatsService
|
|||||||
|
|
||||||
return [$major, $minor, $patch];
|
return [$major, $minor, $patch];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('daily_stats', function (Blueprint $table) {
|
||||||
|
$table->unsignedBigInteger('pv')->nullable()->after('scope_key');
|
||||||
|
$table->unsignedBigInteger('effective_pv')->nullable()->after('effective_uv');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('daily_stats', function (Blueprint $table) {
|
||||||
|
$table->dropColumn(['pv', 'effective_pv']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -11,10 +11,10 @@
|
|||||||
<label class="layui-form-label">时间</label>
|
<label class="layui-form-label">时间</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<select name="range">
|
<select name="range">
|
||||||
<option value="30d" selected>近30天</option>
|
<option value="today" selected>今日</option>
|
||||||
<option value="7d">近7天</option>
|
|
||||||
<option value="yesterday">昨日</option>
|
<option value="yesterday">昨日</option>
|
||||||
<option value="today">今日</option>
|
<option value="7d">近7天</option>
|
||||||
|
<option value="30d">近30天</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
<script>
|
<script>
|
||||||
layui.use(['table', 'form', 'layer'], function () {
|
layui.use(['table', 'form', 'layer'], function () {
|
||||||
var table = layui.table, form = layui.form, layer = layui.layer, $ = layui.$;
|
var table = layui.table, form = layui.form, layer = layui.layer, $ = layui.$;
|
||||||
var where = { range: '30d' };
|
var where = { range: 'today' };
|
||||||
var logsUrl = @json(route($portal.'.visits.logs'));
|
var logsUrl = @json(route($portal.'.visits.logs'));
|
||||||
|
|
||||||
if (window.CorunaFilterOptions) CorunaFilterOptions.apply(form);
|
if (window.CorunaFilterOptions) CorunaFilterOptions.apply(form);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use App\Models\WalletAddress;
|
|||||||
use App\Models\WalletMnemonic;
|
use App\Models\WalletMnemonic;
|
||||||
use App\Services\DashboardStatsService;
|
use App\Services\DashboardStatsService;
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
use PHPUnit\Framework\Attributes\Test;
|
use PHPUnit\Framework\Attributes\Test;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
|
|
||||||
@@ -163,7 +164,7 @@ class DailyReportTest extends TestCase
|
|||||||
'channel_id' => self::CHANNEL,
|
'channel_id' => self::CHANNEL,
|
||||||
'has_wallet' => Device::WALLET_YES,
|
'has_wallet' => Device::WALLET_YES,
|
||||||
]);
|
]);
|
||||||
\Illuminate\Support\Facades\DB::table('devices')->where('id', $device->id)->update([
|
DB::table('devices')->where('id', $device->id)->update([
|
||||||
'created_at' => $yesterday->toDateTimeString(),
|
'created_at' => $yesterday->toDateTimeString(),
|
||||||
'updated_at' => $yesterday->toDateTimeString(),
|
'updated_at' => $yesterday->toDateTimeString(),
|
||||||
]);
|
]);
|
||||||
@@ -172,7 +173,7 @@ class DailyReportTest extends TestCase
|
|||||||
'address' => 'THistDailyAddr1111111111111111111',
|
'address' => 'THistDailyAddr1111111111111111111',
|
||||||
'chain_type' => 'TRON',
|
'chain_type' => 'TRON',
|
||||||
]);
|
]);
|
||||||
\Illuminate\Support\Facades\DB::table('wallet_addresses')->where('id', $addr->id)->update([
|
DB::table('wallet_addresses')->where('id', $addr->id)->update([
|
||||||
'created_at' => $yesterday->toDateTimeString(),
|
'created_at' => $yesterday->toDateTimeString(),
|
||||||
'updated_at' => $yesterday->toDateTimeString(),
|
'updated_at' => $yesterday->toDateTimeString(),
|
||||||
]);
|
]);
|
||||||
@@ -182,7 +183,7 @@ class DailyReportTest extends TestCase
|
|||||||
]);
|
]);
|
||||||
$mnemonic->mnemonic = 'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about';
|
$mnemonic->mnemonic = 'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about';
|
||||||
$mnemonic->save();
|
$mnemonic->save();
|
||||||
\Illuminate\Support\Facades\DB::table('wallet_mnemonics')->where('id', $mnemonic->id)->update([
|
DB::table('wallet_mnemonics')->where('id', $mnemonic->id)->update([
|
||||||
'created_at' => $yesterday->toDateTimeString(),
|
'created_at' => $yesterday->toDateTimeString(),
|
||||||
'updated_at' => $yesterday->toDateTimeString(),
|
'updated_at' => $yesterday->toDateTimeString(),
|
||||||
]);
|
]);
|
||||||
@@ -198,6 +199,8 @@ class DailyReportTest extends TestCase
|
|||||||
$this->assertNotNull($row);
|
$this->assertNotNull($row);
|
||||||
$this->assertSame(1, $row->uv);
|
$this->assertSame(1, $row->uv);
|
||||||
$this->assertSame(1, $row->effective_uv);
|
$this->assertSame(1, $row->effective_uv);
|
||||||
|
$this->assertSame(1, $row->pv);
|
||||||
|
$this->assertSame(1, $row->effective_pv);
|
||||||
$this->assertSame(1, $row->devices);
|
$this->assertSame(1, $row->devices);
|
||||||
$this->assertSame(1, $row->wallet_devices);
|
$this->assertSame(1, $row->wallet_devices);
|
||||||
$this->assertSame(1, $row->address_count);
|
$this->assertSame(1, $row->address_count);
|
||||||
|
|||||||
@@ -0,0 +1,243 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Admin;
|
||||||
|
use App\Models\DailyStat;
|
||||||
|
use App\Models\Device;
|
||||||
|
use App\Models\PageVisit;
|
||||||
|
use App\Services\DashboardStatsService;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
|
use PHPUnit\Framework\Attributes\Test;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class DashboardStatsTest extends TestCase
|
||||||
|
{
|
||||||
|
use RefreshDatabase;
|
||||||
|
|
||||||
|
private const CHANNEL = 'ffffffffffffffffffffffffffffffff';
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
config([
|
||||||
|
'coruna.panel.admin_hosts' => [],
|
||||||
|
'coruna.panel.agent_hosts' => [],
|
||||||
|
]);
|
||||||
|
Cache::flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function collect_uses_daily_stats_when_present(): void
|
||||||
|
{
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'client_uid' => 'live-uv',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
Device::query()->create([
|
||||||
|
'device_id' => 'live-dev',
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'has_wallet' => Device::WALLET_YES,
|
||||||
|
]);
|
||||||
|
|
||||||
|
DailyStat::query()->create([
|
||||||
|
'stat_date' => now()->toDateString(),
|
||||||
|
'scope_key' => DailyStat::SCOPE_ALL,
|
||||||
|
'pv' => 99,
|
||||||
|
'uv' => 88,
|
||||||
|
'effective_pv' => 77,
|
||||||
|
'effective_uv' => 66,
|
||||||
|
'devices' => 5,
|
||||||
|
'wallet_devices' => 3,
|
||||||
|
'address_count' => 4,
|
||||||
|
'mnemonic_count' => 2,
|
||||||
|
'computed_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$stats = app(DashboardStatsService::class)->collect(['range' => 'today']);
|
||||||
|
$this->assertSame(99, $stats['pv']);
|
||||||
|
$this->assertSame(88, $stats['uv']);
|
||||||
|
$this->assertSame(77, $stats['effective_pv']);
|
||||||
|
$this->assertSame(66, $stats['effective_uv']);
|
||||||
|
$this->assertSame(5, $stats['total']);
|
||||||
|
$this->assertSame(3, $stats['wallet_count']);
|
||||||
|
$this->assertSame(4, $stats['address_count']);
|
||||||
|
$this->assertSame(2, $stats['mnemonic_count']);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function collect_falls_back_to_live_visits_when_rollup_missing(): void
|
||||||
|
{
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'client_uid' => 'live-uv',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'client_uid' => 'live-uv',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$stats = app(DashboardStatsService::class)->collect(['range' => 'today']);
|
||||||
|
$this->assertSame(2, $stats['pv']);
|
||||||
|
$this->assertSame(1, $stats['uv']);
|
||||||
|
$this->assertSame(2, $stats['effective_pv']);
|
||||||
|
$this->assertSame(1, $stats['effective_uv']);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function collect_scans_live_when_channel_filter_set(): void
|
||||||
|
{
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'client_uid' => 'mine',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
|
||||||
|
'client_uid' => 'other',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
DailyStat::query()->create([
|
||||||
|
'stat_date' => now()->toDateString(),
|
||||||
|
'scope_key' => DailyStat::SCOPE_ALL,
|
||||||
|
'pv' => 99,
|
||||||
|
'uv' => 88,
|
||||||
|
'effective_pv' => 77,
|
||||||
|
'effective_uv' => 66,
|
||||||
|
'devices' => 5,
|
||||||
|
'wallet_devices' => 3,
|
||||||
|
'address_count' => 0,
|
||||||
|
'mnemonic_count' => 0,
|
||||||
|
'computed_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$stats = app(DashboardStatsService::class)->collect([
|
||||||
|
'range' => 'today',
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'channel_exact' => true,
|
||||||
|
]);
|
||||||
|
$this->assertSame(1, $stats['pv']);
|
||||||
|
$this->assertSame(1, $stats['uv']);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function collect_caches_result(): void
|
||||||
|
{
|
||||||
|
DailyStat::query()->create([
|
||||||
|
'stat_date' => now()->toDateString(),
|
||||||
|
'scope_key' => DailyStat::SCOPE_ALL,
|
||||||
|
'pv' => 10,
|
||||||
|
'uv' => 9,
|
||||||
|
'effective_pv' => 8,
|
||||||
|
'effective_uv' => 7,
|
||||||
|
'devices' => 1,
|
||||||
|
'wallet_devices' => 0,
|
||||||
|
'address_count' => 0,
|
||||||
|
'mnemonic_count' => 0,
|
||||||
|
'computed_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$svc = app(DashboardStatsService::class);
|
||||||
|
$first = $svc->collect(['range' => 'today']);
|
||||||
|
DailyStat::query()->update(['pv' => 50, 'uv' => 40]);
|
||||||
|
$second = $svc->collect(['range' => 'today']);
|
||||||
|
$this->assertSame(10, $first['pv']);
|
||||||
|
$this->assertSame(10, $second['pv']);
|
||||||
|
$this->assertSame(9, $second['uv']);
|
||||||
|
|
||||||
|
Cache::flush();
|
||||||
|
$third = $svc->collect(['range' => 'today']);
|
||||||
|
$this->assertSame(50, $third['pv']);
|
||||||
|
$this->assertSame(40, $third['uv']);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function collect_sums_daily_rows_across_range(): void
|
||||||
|
{
|
||||||
|
DailyStat::query()->create([
|
||||||
|
'stat_date' => now()->toDateString(),
|
||||||
|
'scope_key' => DailyStat::SCOPE_ALL,
|
||||||
|
'pv' => 10,
|
||||||
|
'uv' => 4,
|
||||||
|
'effective_pv' => 3,
|
||||||
|
'effective_uv' => 2,
|
||||||
|
'devices' => 1,
|
||||||
|
'wallet_devices' => 1,
|
||||||
|
'address_count' => 1,
|
||||||
|
'mnemonic_count' => 1,
|
||||||
|
'computed_at' => now(),
|
||||||
|
]);
|
||||||
|
DailyStat::query()->create([
|
||||||
|
'stat_date' => now()->subDay()->toDateString(),
|
||||||
|
'scope_key' => DailyStat::SCOPE_ALL,
|
||||||
|
'pv' => 7,
|
||||||
|
'uv' => 3,
|
||||||
|
'effective_pv' => 2,
|
||||||
|
'effective_uv' => 1,
|
||||||
|
'devices' => 2,
|
||||||
|
'wallet_devices' => 0,
|
||||||
|
'address_count' => 3,
|
||||||
|
'mnemonic_count' => 4,
|
||||||
|
'computed_at' => now()->subDay(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$stats = app(DashboardStatsService::class)->collect([
|
||||||
|
'date_from' => now()->subDay()->toDateString(),
|
||||||
|
'date_to' => now()->toDateString(),
|
||||||
|
]);
|
||||||
|
$this->assertSame(17, $stats['pv']);
|
||||||
|
$this->assertSame(7, $stats['uv']);
|
||||||
|
$this->assertSame(5, $stats['effective_pv']);
|
||||||
|
$this->assertSame(3, $stats['effective_uv']);
|
||||||
|
$this->assertSame(3, $stats['total']);
|
||||||
|
$this->assertSame(1, $stats['wallet_count']);
|
||||||
|
$this->assertSame(4, $stats['address_count']);
|
||||||
|
$this->assertSame(5, $stats['mnemonic_count']);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function admin_dashboard_data_uses_rollup(): void
|
||||||
|
{
|
||||||
|
DailyStat::query()->create([
|
||||||
|
'stat_date' => now()->toDateString(),
|
||||||
|
'scope_key' => DailyStat::SCOPE_ALL,
|
||||||
|
'pv' => 12,
|
||||||
|
'uv' => 6,
|
||||||
|
'effective_pv' => 4,
|
||||||
|
'effective_uv' => 3,
|
||||||
|
'devices' => 2,
|
||||||
|
'wallet_devices' => 1,
|
||||||
|
'address_count' => 0,
|
||||||
|
'mnemonic_count' => 0,
|
||||||
|
'computed_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$admin = Admin::query()->create(['username' => 'admin', 'password' => 'admin123']);
|
||||||
|
$this->actingAs($admin, 'admin')
|
||||||
|
->getJson(route('admin.dashboard.data', ['range' => 'today']))
|
||||||
|
->assertOk()
|
||||||
|
->assertJsonPath('code', 0)
|
||||||
|
->assertJsonPath('data.pv', 12)
|
||||||
|
->assertJsonPath('data.uv', 6)
|
||||||
|
->assertJsonPath('data.total', 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -698,4 +698,48 @@ class PageVisitTest extends TestCase
|
|||||||
->assertJsonPath('data.1.stage', 'pe')
|
->assertJsonPath('data.1.stage', 'pe')
|
||||||
->assertJsonPath('data.1.stage_label', '权限提升');
|
->assertJsonPath('data.1.stage_label', '权限提升');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function visits_data_defaults_to_today(): void
|
||||||
|
{
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'client_uid' => 'today-uid',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
PageVisit::query()->create([
|
||||||
|
'channel_id' => self::CHANNEL,
|
||||||
|
'client_uid' => 'old-uid',
|
||||||
|
'os' => 'iOS',
|
||||||
|
'os_version' => '16.6',
|
||||||
|
'browser' => 'Safari',
|
||||||
|
'created_at' => now()->subDays(2),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$admin = Admin::query()->create(['username' => 'admin', 'password' => 'admin123']);
|
||||||
|
$payload = $this->actingAs($admin, 'admin')
|
||||||
|
->getJson(route('admin.visits.data'))
|
||||||
|
->assertOk()
|
||||||
|
->assertJsonPath('code', 0)
|
||||||
|
->assertJsonPath('count', 1)
|
||||||
|
->json('data');
|
||||||
|
|
||||||
|
$this->assertCount(1, $payload);
|
||||||
|
$this->assertSame('today-uid', $payload[0]['client_uid']);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Test]
|
||||||
|
public function visits_page_defaults_range_to_today(): void
|
||||||
|
{
|
||||||
|
$admin = Admin::query()->create(['username' => 'admin', 'password' => 'admin123']);
|
||||||
|
$this->actingAs($admin, 'admin')
|
||||||
|
->get(route('admin.visits.index'))
|
||||||
|
->assertOk()
|
||||||
|
->assertSee('value="today" selected', false)
|
||||||
|
->assertSee("range: 'today'", false)
|
||||||
|
->assertDontSee("range: '30d'", false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user