Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/core.lib/src/adapters/NodeIDependsAdapter.js
#	src/core.lib/src/adapters/NodeIDispatcherAdapter.js
#	src/core.lib/src/adapters/NodeIGlobalAdapter.js
#	src/core.lib/src/adapters/index.js
#	src/core.lib/src/apis/file.js
#	src/core.lib/src/apis/friend.js
#	src/core.lib/src/apis/group.js
#	src/core.lib/src/apis/index.js
#	src/core.lib/src/apis/msg.js
#	src/core.lib/src/apis/sign.js
#	src/core.lib/src/apis/user.js
#	src/core.lib/src/apis/webapi.js
#	src/core.lib/src/core.js
#	src/core.lib/src/data.js
#	src/core.lib/src/entities/cache.js
#	src/core.lib/src/entities/constructor.js
#	src/core.lib/src/entities/group.js
#	src/core.lib/src/entities/index.js
#	src/core.lib/src/entities/msg.js
#	src/core.lib/src/entities/notify.js
#	src/core.lib/src/entities/user.js
#	src/core.lib/src/external/hook.js
#	src/core.lib/src/index.js
#	src/core.lib/src/listeners/NodeIKernelBuddyListener.js
#	src/core.lib/src/listeners/NodeIKernelFileAssistantListener.js
#	src/core.lib/src/listeners/NodeIKernelGroupListener.js
#	src/core.lib/src/listeners/NodeIKernelLoginListener.js
#	src/core.lib/src/listeners/NodeIKernelMsgListener.js
#	src/core.lib/src/listeners/NodeIKernelProfileListener.js
#	src/core.lib/src/listeners/NodeIKernelRobotListener.js
#	src/core.lib/src/listeners/NodeIKernelSessionListener.js
#	src/core.lib/src/listeners/NodeIKernelStorageCleanListener.js
#	src/core.lib/src/listeners/index.js
#	src/core.lib/src/services/common.js
#	src/core.lib/src/services/index.js
#	src/core.lib/src/sessionConfig.js
#	src/core.lib/src/utils/config.js
#	src/core.lib/src/utils/db.js
#	src/core.lib/src/utils/rkey.js
#	src/core.lib/src/wrapper.js

src/common/server/http.ts

@@ -61,12 +61,12 @@ export abstract class HttpServerBase {
       this.listen(port, host);
     } catch (e: any) {
       logError('HTTP服务启动失败', e.toString());
-      // llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
+      // httpServerError = "HTTP服务启动失败, " + e.toString()
     }
   }
 
   stop() {
-    // llonebotError.httpServerError = ""
+    // httpServerError = ""
     if (this.server) {
       this.server.close();
       this.server = null;

src/common/utils/qqlevel.ts

@@ -1,5 +1,5 @@
 // QQ等级换算
-import { QQLevel } from '../../core/src/entities';
+import { QQLevel } from '@/core/entities';
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level;

src/common/utils/reboot.ts

@@ -1,15 +1,28 @@
 import { exit } from "process";
 import { resolve } from "path";
-async function reboot() {
+import { writeFile, writeFileSync } from "fs";
+async function rebootWithQuickLogin(uin: string) {
     let batScript = resolve(__dirname, './napcat.bat');
     let batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
     let bashScript = resolve(__dirname, './napcat.sh');
-    //如果是win系统写出 5s延迟启动 默认batUtf8Script启动
-    // 如果是linux系统写出 5s延迟启动 默认bashScript启动
     if (process.platform === 'win32') {
-        // console.log('正在重启...');
+        writeFileSync(resolve(__dirname, './reboot-utf8.bat'), `
+        @echo off
+        timeout /t 5 /nobreak
+        start /b /wait %~dp0\\napcat-utf8.bat -q ${uin}
+        `);
+         // 启动cmd执行脚本
+         
     } else if (process.platform === 'linux') {
-        //console.log('正在重启...');
+        writeFileSync(resolve(__dirname, './reboot.sh'), `
+        #!/bin/bash
+        timeout 5
+        ./napcat-utf8.sh -q ${uin}
+        `);
+        // 启动bash执行脚本
+        
+
+
     }
     exit(0);
 }

src/common/utils/system.ts

@@ -1,10 +1,18 @@
 import os from 'node:os';
 import path from 'node:path';
 
+// 缓解Win7设备兼容性问题
+let osName: string;
+try {
+    osName = os.hostname();
+} catch (e) {
+    osName = "NapCat"
+
+}
 export const systemPlatform = os.platform();
 export const cpuArch = os.arch();
 export const systemVersion = os.release();
-export const hostname = os.hostname();
+export const hostname = osName;
 const homeDir = os.homedir();
 export const downloadsPath = path.join(homeDir, 'Downloads');
 export const systemName = os.type();

src/common/utils/umami.ts

@@ -34,7 +34,7 @@ export function postLoginStatus() {
       'screen': '1920x1080',
       'language': 'zh-CN',
       'title': 'OneBot.Login',
-      'url': '/login/onebot11/1.3.0',
+      'url': '/login/onebot11/1.3.2',
       'referrer': 'https://napcat.demo.cn/login?type=onebot11'
     }
   };