From 4227430080dae6b31af3a73fbd191eab68822df3 Mon Sep 17 00:00:00 2001
From: lxy <liuxinyu_x@163.com>
Date: Wed, 24 Dec 2025 18:09:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BEwechatUser=E5=A2=9E=E5=8A=A0appliaction?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/aspects/token.js  | 2 ++
 lib/aspects/token.js | 2 ++
 src/aspects/token.ts | 8 +++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/es/aspects/token.js b/es/aspects/token.js
index e4e588fb7..e97e051d1 100644
--- a/es/aspects/token.js
+++ b/es/aspects/token.js
@@ -1745,6 +1745,8 @@ async function loginFromWechatEnv(code, env, context, wechatLoginId) {
                 },
                 filter: {
                     userId: wechatLoginData.userId,
+                    applicationId: application.id,
+                    origin: OriginMap[type],
                 },
             }, {
                 dontCollect: true,
diff --git a/lib/aspects/token.js b/lib/aspects/token.js
index 1d3bc51d6..97f8db6b5 100644
--- a/lib/aspects/token.js
+++ b/lib/aspects/token.js
@@ -1771,6 +1771,8 @@ async function loginFromWechatEnv(code, env, context, wechatLoginId) {
                 },
                 filter: {
                     userId: wechatLoginData.userId,
+                    applicationId: application.id,
+                    origin: OriginMap[type],
                 },
             }, {
                 dontCollect: true,
diff --git a/src/aspects/token.ts b/src/aspects/token.ts
index 481749465..d52fcc55a 100644
--- a/src/aspects/token.ts
+++ b/src/aspects/token.ts
@@ -2136,7 +2136,7 @@ async function loginFromWechatEnv<ED extends EntityDict>(
         appSecret!
     ) as WechatPublicInstance;
 
-    const { isSnapshotUser, openId, unionId, ...wechatUserData } =  await wechatInstance.code2Session(code);
+    const { isSnapshotUser, openId, unionId, ...wechatUserData } = await wechatInstance.code2Session(code);
     if (isSnapshotUser) {
         throw new OakUserException('请使用完整服务后再进行登录操作');
     }
@@ -2273,6 +2273,8 @@ async function loginFromWechatEnv<ED extends EntityDict>(
                     },
                     filter: {
                         userId: wechatLoginData.userId!,
+                        applicationId: application!.id,
+                        origin: OriginMap[type],
                     },
                 },
                 {
@@ -3097,7 +3099,7 @@ export async function sendCaptchaByEmail<ED extends EntityDict>(
                 }
             },
             {}
-        );        
+        );
     }
     const { code, captchaId } = await getCode();
 
@@ -3369,7 +3371,7 @@ export async function refreshToken<ED extends EntityDict>(
     if (!token) {
         throw new OakUnloggedInException("Token令牌已失效，请重新登录");
     }
-    
+
     const now = Date.now();
     if (!checkTokenEnvConsistency(env, token.env as WebEnv)) {
         console.log('####### refreshToken 环境改变 start #######\n');