From 604749d08a5f63e0ce10fbd7be39d74ee303db21 Mon Sep 17 00:00:00 2001 From: HenryDu8133 <813367384@qq.com> Date: Sun, 13 Sep 2026 09:29:05 +0800 Subject: [PATCH] =?UTF-8?q?chore(auth):=20=E4=B8=B4=E6=97=B6=E7=A1=AC?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BE=AE=E4=BF=A1=E8=81=9A=E5=90=88=E7=99=BB?= =?UTF-8?q?=E5=BD=95=EF=BC=88aggregate=3Dfalse=EF=BC=89\n\n=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=EF=BC=9A=E5=85=88=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=81=9A=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E4=BA=86?= =?UTF-8?q?=E3=80=82\n\n=E5=8F=8C=E9=87=8D=E4=BF=9D=E9=99=A9=EF=BC=9A\n1)?= =?UTF-8?q?=20=E6=9E=84=E5=BB=BA=E6=9C=9F=E5=BC=80=E5=85=B3=EF=BC=9Anuxt.c?= =?UTF-8?q?onfig.ts=20runtimeConfig.public.oauth.aggregate=20=E7=94=B1\n?= =?UTF-8?q?=20=20=20=E5=8E=9F=E6=9D=A5=E7=9A=84=20!!process.env.AGGREGATE?= =?UTF-8?q?=5FOAUTH=5FAPP=5FID=20=E6=94=B9=E4=B8=BA=E7=A1=AC=E7=BC=96?= =?UTF-8?q?=E7=A0=81=20false=E3=80=82\n=20=20=20=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=9A\n=20=20=20-=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A1=B5=20OAuthButtons.vue=20=E4=B8=AD=E7=9A=84=20v-if=20?= =?UTF-8?q?=E5=88=86=E6=94=AF=E4=B8=8D=E5=86=8D=E6=B8=B2=E6=9F=93=E7=BB=BF?= =?UTF-8?q?=E8=89=B2=E5=BE=AE=E4=BF=A1=E6=8C=89=E9=92=AE\n=20=20=20-=20app?= =?UTF-8?q?/pages/account/index.vue=20=E4=B8=AD=20hasOAuthProviders=20aggr?= =?UTF-8?q?egate=3Dfalse=20=E2=86=92=20=E4=B8=AA=E4=BA=BA=E9=A1=B5\n=20=20?= =?UTF-8?q?=20=20=20=E7=AC=AC=E4=B8=89=E6=96=B9=E7=BB=91=E5=AE=9A=E5=88=86?= =?UTF-8?q?=E5=8C=BA=E5=8D=B3=E4=BD=BF=E5=85=B6=E4=BB=96=20provider=20?= =?UTF-8?q?=E9=83=BD=E6=B2=A1=E9=85=8D=E4=B9=9F=E4=BC=9A=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=B6=E5=AE=83=20provider=EF=BC=8C\n=20=20=20=20=20?= =?UTF-8?q?=E4=BD=86=E5=BE=AE=E4=BF=A1=E5=8D=A1=E7=89=87=20OAuthBindingCar?= =?UTF-8?q?d.vue=20=E5=9B=A0=20config.public.oauth.aggregate=3Dfalse\n=20?= =?UTF-8?q?=20=20=20=20=E8=A2=AB=20v-if=20=E7=9B=B4=E6=8E=A5=E6=8B=BF?= =?UTF-8?q?=E6=8E=89=E4=B8=8D=E6=B8=B2=E6=9F=93\n=20=20=20-=20app/utils/oa?= =?UTF-8?q?uth.ts=20getProviderDisplayName=20=E4=B8=AD=20aggregate?= =?UTF-8?q?=E2=86=92=E5=BE=AE=E4=BF=A1=20=E6=98=A0=E5=B0=84=E8=BF=98?= =?UTF-8?q?=E4=BF=9D=E7=95=99=EF=BC=8C\n=20=20=20=20=20=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E9=9C=80=E5=86=8D=E6=94=B9\n2)=20=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=9C=9F=E5=BC=BA=E5=88=B6=E5=85=B3=EF=BC=9Aserver/ut?= =?UTF-8?q?ils/oauth-strategies.ts=20loadAggregateSettings\n=20=20=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=20aggregateOAuthEnabled=20=E7=A1=AC?= =?UTF-8?q?=E7=BC=96=E7=A0=81=20false=EF=BC=88=E5=8D=B3=E4=BD=BF=20process?= =?UTF-8?q?.env.AGGREGATE=5FOAUTH=5FAPP=5FID\n=20=20=20=E5=92=8C=20system?= =?UTF-8?q?=5Fsettings=20=E8=A1=A8=E9=83=BD=E9=85=8D=E9=BD=90=E4=B9=9F?= =?UTF-8?q?=E4=B8=8D=E5=90=AF=E7=94=A8=EF=BC=89=E3=80=82=E5=B9=B6=E5=8A=A0?= =?UTF-8?q?=20=5FhardDisabledReason=20=E5=AD=97=E6=AE=B5=E7=BB=99=E5=90=8E?= =?UTF-8?q?=E7=BB=AD=E6=97=A5=E5=BF=97\n=20=20=20=E7=95=99=E8=A7=A3?= =?UTF-8?q?=E9=87=8A=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BB=A5=E5=90=8E=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=E4=B8=BA=E4=BD=95=20ENV/DB=20=E9=83=BD=E6=9C=89?= =?UTF-8?q?=E5=80=BC=E5=8D=B4=20500=20=E8=AF=B4=E6=9C=AA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=82\n\n=E5=90=8E=E7=BB=AD=E6=81=A2=E5=A4=8D=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=EF=BC=88=E4=B8=A4=E5=A4=84=E5=90=8C=E6=97=B6=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E5=8D=B3=E5=8F=AF=EF=BC=89=EF=BC=9A\n=20=20A.=20nuxt.?= =?UTF-8?q?config.ts=20public.oauth.aggregate=20=E6=94=B9=E5=9B=9E\n=20=20?= =?UTF-8?q?=20=20=20aggregate:=20!!process.env.AGGREGATE=5FOAUTH=5FAPP=5FI?= =?UTF-8?q?D\n=20=20B.=20server/utils/oauth-strategies.ts=20loadAggregateS?= =?UTF-8?q?ettings=20=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1\n=20=20=20=20=20?= =?UTF-8?q?aggregateOAuthEnabled=20=E6=94=B9=E5=9B=9E=E5=8E=9F=E6=9C=AC?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A\n=20=20=20=20=20enabled=20&&=20!!(a?= =?UTF-8?q?ppId=20&&=20appKey=20&&=20endpoint)\n=20=20=20=20=20=E5=B9=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20=5FhardDisabledReason=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8D=B3=E5=8F=AF=E3=80=82\n\n=E6=B3=A8=E6=84=8F=EF=BC=9AGitea?= =?UTF-8?q?=20Repository=20Secrets=20=E4=B8=AD=E7=9A=84=206=20=E6=9D=A1=20?= =?UTF-8?q?AGGREGATE=5FOAUTH=20/=20OAUTH=5F*=20=E6=B2=A1=E6=9C=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C\n=E4=BF=9D=E7=95=99=E5=9C=A8=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E9=87=8C=EF=BC=8C=E4=B8=8B=E6=AC=A1=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E9=87=8D=E6=96=B0=E8=BE=93=E5=85=A5=E4=B8=80?= =?UTF-8?q?=E9=81=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nuxt.config.ts | 2 +- server/utils/oauth-strategies.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index f0eefe7..a8c5b78 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -133,7 +133,7 @@ export default defineNuxtConfig({ github: !!process.env.GITHUB_CLIENT_ID, casdoor: !!process.env.CASDOOR_CLIENT_ID, google: !!process.env.GOOGLE_CLIENT_ID, - aggregate: !!process.env.AGGREGATE_OAUTH_APP_ID + aggregate: false }, siteTitle: process.env.NUXT_PUBLIC_SITE_TITLE || '校园广播站点歌系统', siteLogo: process.env.NUXT_PUBLIC_SITE_LOGO || '', diff --git a/server/utils/oauth-strategies.ts b/server/utils/oauth-strategies.ts index c265b66..b7133ca 100644 --- a/server/utils/oauth-strategies.ts +++ b/server/utils/oauth-strategies.ts @@ -300,13 +300,15 @@ async function loadAggregateSettings() { const endpoint = ((base?.aggregateOAuthEndpoint as string) || envEndpoint || '') as string const result: any = { - aggregateOAuthEnabled: enabled && !!(appId && appKey && endpoint), + aggregateOAuthEnabled: false, aggregateOAuthAppId: appId, aggregateOAuthAppKey: appKey, aggregateOAuthLoginType: loginType, aggregateOAuthEndpoint: endpoint, _dbHasConfig: dbHasConfig, - _hasEnvConfig: hasEnvConfig + _hasEnvConfig: hasEnvConfig, + _hardDisabledReason: + '[hard-disabled] nuxt.config.ts public.oauth.aggregate 已硬编码 false，暂时关闭微信聚合登录；恢复时同时改 nuxt.config.ts 改回 !!process.env.AGGREGATE_OAUTH_APP_ID 以及删除此处的强制 false' } console.log(