From 9ef58b5724673bd3bf6f4990aaf757fb73468e76 Mon Sep 17 00:00:00 2001 From: admin <362324317@qq.com> Date: Tue, 19 May 2026 05:06:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20push=5Fusers=E8=A1=A8=20+=20cookie=5Fuid?= =?UTF-8?q?=E5=88=97=20+=20=5F=5Fuid=E6=AD=A3=E5=88=99=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20+=20deploy.sh=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- source_clean/VERSION | 2 +- source_clean/deploy.sh | Bin 6201 -> 4123 bytes source_clean/src/cloud/credential.service.ts | 4 ++-- source_clean/src/database/database.ts | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 76914dd..e8423da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.9 +0.4.10 diff --git a/source_clean/VERSION b/source_clean/VERSION index 76914dd..e8423da 100644 --- a/source_clean/VERSION +++ b/source_clean/VERSION @@ -1 +1 @@ -0.4.9 +0.4.10 diff --git a/source_clean/deploy.sh b/source_clean/deploy.sh index d2f20e164516f03ea6402115232d7b19de443e0a..98c4b81baa2c85aab55bd8cec388a99b101575bd 100755 GIT binary patch delta 1661 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 diff --git a/source_clean/src/cloud/credential.service.ts b/source_clean/src/cloud/credential.service.ts index 1ecd168..264dbbe 100644 --- a/source_clean/src/cloud/credential.service.ts +++ b/source_clean/src/cloud/credential.service.ts @@ -35,9 +35,9 @@ function decryptCookie(encrypted: string): string { function extractCookieUid(cookie: string): string { if (!cookie) return ''; - let m = cookie.match(/__uid=([a-zA-Z0-9+/=_-]+)/); + let m = cookie.match(/__uid=([^;]+)/); if (m) return m[1]; - m = cookie.match(/b-user-id=([a-zA-Z0-9-]+)/); + m = cookie.match(/b-user-id=([^;]+)/); if (m) return m[1]; return ''; } diff --git a/source_clean/src/database/database.ts b/source_clean/src/database/database.ts index 921b83f..a7f655f 100755 --- a/source_clean/src/database/database.ts +++ b/source_clean/src/database/database.ts @@ -40,6 +40,7 @@ function runMigrations(db: Database.Database): void { cloud_type TEXT NOT NULL, cookie TEXT, cloud_type_uid TEXT DEFAULT NULL, + cookie_uid TEXT DEFAULT NULL, nickname TEXT, is_active INTEGER NOT NULL DEFAULT 1, storage_used TEXT, @@ -108,6 +109,13 @@ function runMigrations(db: Database.Database): void { value TEXT NOT NULL DEFAULT '', description TEXT, updated_at TEXT NOT NULL DEFAULT (datetime('now', 'localtime')) + CREATE TABLE IF NOT EXISTS push_users ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + account TEXT NOT NULL UNIQUE, + notify_config TEXT, + created_at TEXT NOT NULL DEFAULT (datetime('now','localtime')), + updated_at TEXT NOT NULL DEFAULT (datetime('now','localtime')) + ); ); CREATE TABLE IF NOT EXISTS content_cache ( @@ -209,6 +217,7 @@ function migrateCloudConfigs(db: Database.Database): void { cookie TEXT, cloud_type_uid TEXT DEFAULT NULL, nickname TEXT, + cookie_uid TEXT DEFAULT NULL, is_active INTEGER NOT NULL DEFAULT 1, storage_used TEXT, storage_total TEXT,