From cae84bbf02d4fe57527032c587d95ae109b01814 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: Fri, 10 May 2024 17:55:29 +0800 Subject: [PATCH] style: rename DataRuntime to WebUiDataRuntime --- src/core | 2 +- src/index.ts | 14 +++++++------- src/webui/src/api/Auth.ts | 4 ++-- src/webui/src/api/OB11Config.ts | 10 +++++----- src/webui/src/api/QQLogin.ts | 16 ++++++++-------- src/webui/src/helper/Data.ts | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/core b/src/core index ac8e7c32..f2851206 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit ac8e7c3226137e9c3ed827a3ec3408f4ba36ef24 +Subproject commit f285120670e02b0ee7d432c573a6b9b57b701367 diff --git a/src/index.ts b/src/index.ts index 71f81430..3f64a807 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,7 +9,7 @@ import { log, logDebug, logError, LogLevel, setLogLevel } from '@/common/utils/l import { NapCatOnebot11 } from '@/onebot11/main'; import { hookApi } from '@/core/external/hook'; import { InitWebUi } from './webui/index'; -import { DataRuntime } from './webui/src/helper/Data'; +import { WebUiDataRuntime } from './webui/src/helper/Data'; program .option('-q, --qq ', 'QQ号') .parse(process.argv); @@ -44,12 +44,12 @@ checkVersion().then((remoteVersion: string) => { new NapCatOnebot11(); napCatCore.onLoginSuccess((uin, uid) => { console.log('登录成功!'); - DataRuntime.setQQLoginStatus(true); - DataRuntime.setQQLoginUin(uin.toString()); + WebUiDataRuntime.setQQLoginStatus(true); + WebUiDataRuntime.setQQLoginUin(uin.toString()); postLoginStatus(); }); const showQRCode = async (url: string, base64: string, buffer: Buffer) => { - await DataRuntime.setQQLoginQrcodeURL(url); + await WebUiDataRuntime.setQQLoginQrcodeURL(url); console.log('请扫描下面的二维码，然后在手Q上授权登录：'); const qrcodePath = path.join(__dirname, 'qrcode.png'); qrcode.generate(url, { small: true }, (res) => { @@ -65,11 +65,11 @@ const quickLoginQQ = cmdOptions.qq; // napCatCore.qrLogin().then().catch(console.error); // }); napCatCore.getQuickLoginList().then((res) => { - // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用DataRuntime.setQQQuickLoginList - DataRuntime.setQQQuickLoginList(res.LocalLoginInfoList.filter((item) => item.isQuickLogin).map((item) => item.uin.toString())); + // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList + WebUiDataRuntime.setQQQuickLoginList(res.LocalLoginInfoList.filter((item) => item.isQuickLogin).map((item) => item.uin.toString())); }); -DataRuntime.setQQQuickLogin(async (uin: string) => { +WebUiDataRuntime.setQQQuickLogin(async (uin: string) => { let QuickLogin: Promise<{ result: boolean, message: string }> = new Promise((resolve, reject) => { if (quickLoginQQ) { log('正在快速登录 ', quickLoginQQ); diff --git a/src/webui/src/api/Auth.ts b/src/webui/src/api/Auth.ts index 0992e50d..49a9e04d 100644 --- a/src/webui/src/api/Auth.ts +++ b/src/webui/src/api/Auth.ts @@ -1,7 +1,7 @@ import { RequestHandler } from "express"; import { AuthHelper } from "../helper/SignToken"; import { WebUiConfig } from "../helper/config"; -import { DataRuntime } from "../helper/Data"; +import { WebUiDataRuntime } from "../helper/Data"; const isEmpty = (data: any) => data === undefined || data === null || data === ''; export const LoginHandler: RequestHandler = async (req, res) => { let WebUiConfigData = await WebUiConfig.GetWebUIConfig(); @@ -13,7 +13,7 @@ export const LoginHandler: RequestHandler = async (req, res) => { }); return; } - if (!await DataRuntime.checkLoginRate(WebUiConfigData.loginRate)) { + if (!await WebUiDataRuntime.checkLoginRate(WebUiConfigData.loginRate)) { res.json({ code: -1, message: 'login rate limit' diff --git a/src/webui/src/api/OB11Config.ts b/src/webui/src/api/OB11Config.ts index 94fb8f94..ad4fe4ef 100644 --- a/src/webui/src/api/OB11Config.ts +++ b/src/webui/src/api/OB11Config.ts @@ -1,11 +1,11 @@ import { RequestHandler } from "express"; -import { DataRuntime } from "../helper/Data"; +import { WebUiDataRuntime } from "../helper/Data"; import { existsSync, readFileSync, writeFileSync } from "node:fs"; import { resolve } from "node:path"; import { OB11Config } from "@/webui/ui/components/WebUiApiOB11Config"; const isEmpty = (data: any) => data === undefined || data === null || data === ''; export const OB11GetConfigHandler: RequestHandler = async (req, res) => { - let isLogin = await DataRuntime.getQQLoginStatus(); + let isLogin = await WebUiDataRuntime.getQQLoginStatus(); if (!isLogin) { res.send({ code: -1, @@ -13,7 +13,7 @@ export const OB11GetConfigHandler: RequestHandler = async (req, res) => { }); return; } - const uin = await DataRuntime.getQQLoginUin(); + const uin = await WebUiDataRuntime.getQQLoginUin(); let configFilePath = resolve(__dirname, `./config/onebot11_${uin}.json`); //console.log(configFilePath); let data: OB11Config; @@ -36,7 +36,7 @@ export const OB11GetConfigHandler: RequestHandler = async (req, res) => { return; } export const OB11SetConfigHandler: RequestHandler = async (req, res) => { - let isLogin = await DataRuntime.getQQLoginStatus(); + let isLogin = await WebUiDataRuntime.getQQLoginStatus(); if (!isLogin) { res.send({ code: -1, @@ -51,7 +51,7 @@ export const OB11SetConfigHandler: RequestHandler = async (req, res) => { }); return; } - let configFilePath = resolve(__dirname, `./config/onebot11_${await DataRuntime.getQQLoginUin()}.json`); + let configFilePath = resolve(__dirname, `./config/onebot11_${await WebUiDataRuntime.getQQLoginUin()}.json`); try { JSON.parse(req.body.config) readFileSync(configFilePath); diff --git a/src/webui/src/api/QQLogin.ts b/src/webui/src/api/QQLogin.ts index 6548894d..c7c905a4 100644 --- a/src/webui/src/api/QQLogin.ts +++ b/src/webui/src/api/QQLogin.ts @@ -1,16 +1,16 @@ import { RequestHandler } from "express"; -import { DataRuntime } from "../helper/Data"; +import { WebUiDataRuntime } from "../helper/Data"; import { sleep } from "@/common/utils/helper"; const isEmpty = (data: any) => data === undefined || data === null || data === ''; export const QQGetQRcodeHandler: RequestHandler = async (req, res) => { - if (await DataRuntime.getQQLoginStatus()) { + if (await WebUiDataRuntime.getQQLoginStatus()) { res.send({ code: -1, message: 'QQ Is Logined' }); return; } - let qrcodeUrl = await DataRuntime.getQQLoginQrcodeURL(); + let qrcodeUrl = await WebUiDataRuntime.getQQLoginQrcodeURL(); if (isEmpty(qrcodeUrl)) { res.send({ code: -1, @@ -32,13 +32,13 @@ export const QQCheckLoginStatusHandler: RequestHandler = async (req, res) => { code: 0, message: 'success', data: { - isLogin: await DataRuntime.getQQLoginStatus() + isLogin: await WebUiDataRuntime.getQQLoginStatus() } }); }; export const QQSetQuickLoginHandler: RequestHandler = async (req, res) => { let { uin } = req.body; - let isLogin = await DataRuntime.getQQLoginStatus(); + let isLogin = await WebUiDataRuntime.getQQLoginStatus(); if (isLogin) { res.send({ code: -1, @@ -53,7 +53,7 @@ export const QQSetQuickLoginHandler: RequestHandler = async (req, res) => { }); return; } - const { result, message } = await DataRuntime.getQQQuickLogin(uin); + const { result, message } = await WebUiDataRuntime.getQQQuickLogin(uin); if (!result) { res.send({ code: -1, @@ -62,14 +62,14 @@ export const QQSetQuickLoginHandler: RequestHandler = async (req, res) => { return; } //本来应该验证 但是http不宜这么搞 建议前端验证 - //isLogin = await DataRuntime.getQQLoginStatus(); + //isLogin = await WebUiDataRuntime.getQQLoginStatus(); res.send({ code: 0, message: 'success' }); } export const QQGetQuickLoginListHandler: RequestHandler = async (req, res) => { - const quickLoginList = await DataRuntime.getQQQuickLoginList(); + const quickLoginList = await WebUiDataRuntime.getQQQuickLoginList(); res.send({ code: 0, data: quickLoginList diff --git a/src/webui/src/helper/Data.ts b/src/webui/src/helper/Data.ts index e4d53b8b..1209264d 100644 --- a/src/webui/src/helper/Data.ts +++ b/src/webui/src/helper/Data.ts @@ -20,7 +20,7 @@ let LoginRuntime: LoginRuntimeType = { QQLoginList: [] } } -export const DataRuntime = { +export const WebUiDataRuntime = { checkLoginRate: async function (RateLimit: number): Promise { LoginRuntime.LoginCurrentRate++; //console.log(RateLimit, LoginRuntime.LoginCurrentRate, Date.now() - LoginRuntime.LoginCurrentTime);