From e5d3a8360c8ae5bcb37fa08c2b22782de80439ab 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, 8 May 2024 18:45:45 +0800 Subject: [PATCH] fix:config --- src/webui/Readme.md | 7 ++----- src/webui/src/api/OB11Config.ts | 5 +++-- src/webui/ui/components/WebUiApiOB11Config.ts | 2 +- static/assets/renderer.js | 6 +++++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/webui/Readme.md b/src/webui/Readme.md index 58e0997c..c79d50bd 100644 --- a/src/webui/Readme.md +++ b/src/webui/Readme.md @@ -1,5 +1,2 @@ -{ - "port": 6099,//端口 - "token": "123456",//密码 - "loginRate": 3//速率 -} \ No newline at end of file +# The Path of NapCatQQ +Tiny WebUi for NapCatQQ \ No newline at end of file diff --git a/src/webui/src/api/OB11Config.ts b/src/webui/src/api/OB11Config.ts index 7c07be93..5f79ce96 100644 --- a/src/webui/src/api/OB11Config.ts +++ b/src/webui/src/api/OB11Config.ts @@ -2,7 +2,7 @@ import { RequestHandler } from "express"; import { DataRuntime } from "../helper/Data"; import { existsSync, readFileSync, writeFileSync } from "node:fs"; import { resolve } from "node:path"; -import { OB11Config } from "@/webui/ui/components/WebApi"; +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(); @@ -53,12 +53,13 @@ export const OB11SetConfigHandler: RequestHandler = async (req, res) => { } let configFilePath = resolve(__dirname, `./config/onebot_${await DataRuntime.getQQLoginUin()}.json`); try { + JSON.parse(req.body.config) readFileSync(configFilePath); } catch (e) { configFilePath = resolve(__dirname, `./config/onebot.json`); } - writeFileSync(configFilePath, JSON.stringify(req.body.config, null, 4)); + writeFileSync(configFilePath, JSON.stringify(JSON.parse(req.body.config), null, 4)); res.send({ code: 0, message: 'success' diff --git a/src/webui/ui/components/WebUiApiOB11Config.ts b/src/webui/ui/components/WebUiApiOB11Config.ts index 8d6d189d..4c02e205 100644 --- a/src/webui/ui/components/WebUiApiOB11Config.ts +++ b/src/webui/ui/components/WebUiApiOB11Config.ts @@ -49,7 +49,7 @@ class WebUiApiOB11ConfigWrapper { 'Authorization': "Bearer " + this.retCredential, 'Content-Type': 'application/json' }, - body: JSON.stringify(config) + body: JSON.stringify({ config: JSON.stringify(config) }) } ); if (ConfigResponse.status == 200) { diff --git a/static/assets/renderer.js b/static/assets/renderer.js index cd5536c9..b478d457 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -150,7 +150,11 @@ async function onSettingWindowCreated(view) { const isEmpty = (value) => value === void 0 || value === void 0 || value === ""; let ob11Config = await OB11ConfigWrapper.GetOB11Config(); const setOB11Config = (key, value) => { - console.log(key, value); + const configKey = key.split("."); + if (configKey.length === 2) { + ob11Config[configKey[1]] = value; + } + OB11ConfigWrapper.SetOB11Config(ob11Config); }; const parser = new DOMParser(); const doc = parser.parseFromString(