feat: msg push

src/onebot/config/config.ts

@@ -1,6 +1,6 @@
 export interface AdapterConfig {
     name: string;
-    enabled: boolean;
+    enable: boolean;
     [key: string]: any;
 }
 
@@ -8,8 +8,8 @@ const createDefaultAdapterConfig = <T extends AdapterConfig>(config: T): T => co
 
 const httpServerDefaultConfigs = createDefaultAdapterConfig({
     name: 'http-server',
-    enabled: false,
-    port: '3000',
+    enable: false,
+    port: 3000,
     host: '0.0.0.0',
     enableCors: true,
     enableWebsocket: true,
@@ -22,7 +22,7 @@ export type HttpServerConfig = typeof httpServerDefaultConfigs;
 
 const httpClientDefaultConfigs = createDefaultAdapterConfig({
     name: 'http-client',
-    enabled: false,
+    enable: false,
     url: 'http://localhost:8080',
     messagePostFormat: 'array',
     reportSelfMessage: false,
@@ -33,9 +33,9 @@ export type HttpClientConfig = typeof httpClientDefaultConfigs;
 
 const websocketServerDefaultConfigs = createDefaultAdapterConfig({
     name: 'websocket-server',
-    enabled: false,
+    enable: false,
     host: '0.0.0.0',
-    port: '3002',
+    port: 3002,
     messagePostFormat: 'array',
     reportSelfMessage: false,
     token: '',
@@ -47,7 +47,7 @@ export type WebsocketServerConfig = typeof websocketServerDefaultConfigs;
 
 const websocketClientDefaultConfigs = createDefaultAdapterConfig({
     name: 'websocket-client',
-    enabled: false,
+    enable: false,
     url: 'ws://localhost:8082',
     messagePostFormat: 'array',
     reportSelfMessage: false,
@@ -71,6 +71,7 @@ export function mergeConfigs<T extends AdapterConfig>(defaultConfig: T, userConf
 export interface OnebotConfig {
     network: NetworkConfig;//网络配置
     musicSignUrl: string;//音乐签名地址
+    enableLocalFile2Url: boolean
 }
 
 const createDefaultConfig = <T>(config: T): T => config;
@@ -82,7 +83,8 @@ export const defaultOnebotConfig = createDefaultConfig<OnebotConfig>({
         websocketServers: [],
         websocketClients: [],
     },
-    musicSignUrl: ""
+    musicSignUrl: "",
+    enableLocalFile2Url: false
 })
 export const mergeNetworkDefaultConfig = {
     httpServers: httpServerDefaultConfigs,
@@ -110,4 +112,4 @@ export function mergeOnebotConfigs(defaultConfig: OnebotConfig, userConfig: Part
         mergedConfig.musicSignUrl = userConfig.musicSignUrl;
     }
     return mergedConfig;
-}
+}

src/onebot/config/index.ts

@@ -1,11 +1,9 @@
 import { ConfigBase } from '@/common/config-base';
-import ob11DefaultConfig from './onebot11.json';
 import { NapCatCore } from '@/core';
+import { OnebotConfig } from './config';
 
-export type OB11Config = typeof ob11DefaultConfig;
-
-export class OB11ConfigLoader extends ConfigBase<OB11Config> {
+export class OB11ConfigLoader extends ConfigBase<OnebotConfig> {
     constructor(core: NapCatCore, configPath: string) {
-        super('onebot11', core, configPath);
+        super('onebot11', core, configPath, false);
     }
 }

src/onebot/config/onebot11.json

@@ -1,31 +0,0 @@
-{
-    "http": {
-        "enable": false,
-        "host": "",
-        "port": 3000,
-        "secret": "",
-        "enableHeart": false,
-        "enablePost": false,
-        "postUrls": []
-    },
-    "ws": {
-        "enable": false,
-        "host": "",
-        "port": 3001
-    },
-    "reverseWs": {
-        "enable": false,
-        "urls": []
-    },
-    "GroupLocalTime": {
-        "Record": false,
-        "RecordList": []
-    },
-    "debug": false,
-    "heartInterval": 30000,
-    "messagePostFormat": "array",
-    "enableLocalFile2Url": true,
-    "musicSignUrl": "",
-    "reportSelfMessage": false,
-    "token": ""
-}