From 52336cb95268497ce81b4e0a5efcea7b308b734a Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Mon, 21 Apr 2025 10:11:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4extraFile=E6=97=B6?= =?UTF-8?q?=E8=BF=9C=E7=AB=AF=E4=B9=9F=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=B6=EF=BC=8CgetApplication=E7=BD=AE=E4=B8=8Atrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/triggers/extraFile.js | 2 +- lib/triggers/extraFile.js | 2 +- src/triggers/extraFile.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/triggers/extraFile.js b/es/triggers/extraFile.js index 72a91e8fb..86a3a6762 100644 --- a/es/triggers/extraFile.js +++ b/es/triggers/extraFile.js @@ -69,7 +69,7 @@ const triggers = [ }, {}); if (count === 0) { const uploader = getCosBackend(origin); - const application2 = context.getApplication() || application; + const application2 = context.getApplication(true) || application; await uploader.removeFile(application2, extraFile); } } diff --git a/lib/triggers/extraFile.js b/lib/triggers/extraFile.js index 871bf3ffa..2e1fa5369 100644 --- a/lib/triggers/extraFile.js +++ b/lib/triggers/extraFile.js @@ -71,7 +71,7 @@ const triggers = [ }, {}); if (count === 0) { const uploader = (0, index_backend_1.getCosBackend)(origin); - const application2 = context.getApplication() || application; + const application2 = context.getApplication(true) || application; await uploader.removeFile(application2, extraFile); } } diff --git a/src/triggers/extraFile.ts b/src/triggers/extraFile.ts index 3621adab5..c43a21f52 100644 --- a/src/triggers/extraFile.ts +++ b/src/triggers/extraFile.ts @@ -79,7 +79,7 @@ const triggers: Trigger>[] = [ }, {}); if (count === 0) { const uploader = getCosBackend(origin!); - const application2 = context.getApplication() || application; + const application2 = context.getApplication(true) || application; await uploader.removeFile( application2 as EntityDict['application']['Schema'], extraFile as EntityDict['extraFile']['OpSchema'] From e8b952388edba4913256f6d8115881a4db3375c0 Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Mon, 21 Apr 2025 16:59:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4cache.get=20allowMiss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/features/wechatSdk.mp.js | 2 +- lib/features/wechatSdk.mp.js | 2 +- src/features/wechatSdk.mp.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/features/wechatSdk.mp.js b/es/features/wechatSdk.mp.js index e333f3e75..0d6354938 100644 --- a/es/features/wechatSdk.mp.js +++ b/es/features/wechatSdk.mp.js @@ -40,7 +40,7 @@ export class WechatSdk extends Feature { $in: messageTypes, }, }, - }, { allowMiss: true }); + }); if (mttIds.length < messageTypes.length) { mttIds = (await this.cache.refresh('messageTypeTemplate', { data: { diff --git a/lib/features/wechatSdk.mp.js b/lib/features/wechatSdk.mp.js index aeb150ca4..aa2aa4c78 100644 --- a/lib/features/wechatSdk.mp.js +++ b/lib/features/wechatSdk.mp.js @@ -44,7 +44,7 @@ class WechatSdk extends Feature_1.Feature { $in: messageTypes, }, }, - }, { allowMiss: true }); + }); if (mttIds.length < messageTypes.length) { mttIds = (await this.cache.refresh('messageTypeTemplate', { data: { diff --git a/src/features/wechatSdk.mp.ts b/src/features/wechatSdk.mp.ts index 5c8815a52..e7cf10c75 100644 --- a/src/features/wechatSdk.mp.ts +++ b/src/features/wechatSdk.mp.ts @@ -50,7 +50,7 @@ export class WechatSdk extends Feature { $in: messageTypes, }, }, - }, { allowMiss: true }); + }); if (mttIds.length < messageTypes.length) { mttIds = (await this.cache.refresh('messageTypeTemplate', { data: { From 1466a47c6961b372f377dc177b8d2756f0436d50 Mon Sep 17 00:00:00 2001 From: qsc <3153284618@qq.com> Date: Tue, 22 Apr 2025 13:56:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0extraFi?= =?UTF-8?q?le=20entityId=E4=BC=A0=E5=85=A5oakId=E6=88=96=E6=98=AF=E8=87=AA?= =?UTF-8?q?=E8=BA=ABid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/article/upsert/web.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/article/upsert/web.tsx b/src/components/article/upsert/web.tsx index c5541175e..05cfc276c 100644 --- a/src/components/article/upsert/web.tsx +++ b/src/components/article/upsert/web.tsx @@ -91,6 +91,7 @@ export default function Render( clearContentTip, } = methods; const { + oakId, oakFullpath, id, content, @@ -207,7 +208,7 @@ export default function Render( ); const extraFile = { entity: "article", - entityId: articleId, + entityId: oakId || articleId, origin: origin, type: "image", tag1: "source", @@ -261,7 +262,7 @@ export default function Render( ); const extraFile = { entity: "article", - entityId: articleId, + entityId: oakId || articleId, origin: origin, type: "video", tag1: "source",