From 336dd3ce10bffb1915ada68621cc0346e7414416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Wed, 11 Sep 2024 22:13:45 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/apis/file.ts | 2 +- src/core/helper/rkey.ts | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 5a30fd4b..de01aaec 100644 --- a/src/core/apis/file.ts +++ b/src/core/apis/file.ts @@ -33,7 +33,7 @@ export class NTQQFileApi { constructor(context: InstanceContext, core: NapCatCore) { this.context = context; this.core = core; - this.rkeyManager = new RkeyManager('https://llob.linyuchen.net/rkey', this.context.logger); + this.rkeyManager = new RkeyManager(['https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger); } async copyFile(filePath: string, destPath: string) { diff --git a/src/core/helper/rkey.ts b/src/core/helper/rkey.ts index dd7b5059..89517e21 100644 --- a/src/core/helper/rkey.ts +++ b/src/core/helper/rkey.ts @@ -8,7 +8,7 @@ interface ServerRkeyData { } export class RkeyManager { - serverUrl: string = ''; + serverUrl: string[] = []; logger: LogWrapper; private rkeyData: ServerRkeyData = { group_rkey: '', @@ -16,7 +16,7 @@ export class RkeyManager { expired_time: 0, }; - constructor(serverUrl: string, logger: LogWrapper) { + constructor(serverUrl: string[], logger: LogWrapper) { this.logger = logger; this.serverUrl = serverUrl; } @@ -40,6 +40,13 @@ export class RkeyManager { async refreshRkey(): Promise { //刷新rkey - this.rkeyData = await RequestUtil.HttpGetJson(this.serverUrl, 'GET'); + for (let url of this.serverUrl) { + try { + this.rkeyData = await RequestUtil.HttpGetJson(url, 'GET'); + } catch (e) { + this.logger.logError(`[Rkey] Get Rkey ${url} Error `, e); + } + } + } }