diff --git a/src/common/data.ts b/src/common/data.ts
index 01ac1102..fdee5687 100644
--- a/src/common/data.ts
+++ b/src/common/data.ts
@@ -4,7 +4,7 @@ import {
   type Group,
   type GroupMember, GroupNotify,
   type SelfInfo
-} from '@/core/qqnt/entities';
+} from '../core/src/entities';
 import { isNumeric } from './utils/helper';
 import { log } from '@/common/utils/log';
 
diff --git a/src/common/utils/db.ts b/src/common/utils/db.ts
index d44133f0..7ca91e50 100644
--- a/src/common/utils/db.ts
+++ b/src/common/utils/db.ts
@@ -1,4 +1,4 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
+import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
 
 import sqlite3 from 'sqlite3';
 import { log } from '@/common/utils/log';
diff --git a/src/common/utils/file.ts b/src/common/utils/file.ts
index a92185f5..292ff537 100644
--- a/src/common/utils/file.ts
+++ b/src/common/utils/file.ts
@@ -10,7 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { napCatCore } from '@/core';
 
 export const getNapCatDir = () => {
-  const p = path.join(napCatCore.wrapper.dataPath, 'NapCat');
+  const p = path.join(napCatCore.dataPath, 'NapCat');
   fs.mkdirSync(p, { recursive: true });
   return p;
 };
diff --git a/src/common/utils/qqlevel.ts b/src/common/utils/qqlevel.ts
index f1f989fc..d03af691 100644
--- a/src/common/utils/qqlevel.ts
+++ b/src/common/utils/qqlevel.ts
@@ -1,5 +1,5 @@
 // QQ等级换算
-import { QQLevel } from '@/core/qqnt/entities';
+import { QQLevel } from '../../core/src/entities';
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level;
diff --git a/src/core b/src/core
index 853c771c..6a5f738a 160000
--- a/src/core
+++ b/src/core
@@ -1 +1 @@
-Subproject commit 853c771c0500cf91fc35b68d21ac2a101820334d
+Subproject commit 6a5f738a9b041793cb4bcd403c1882001b0c31df
diff --git a/src/core.lib/src/qqnt/apis/file.d.ts b/src/core.lib/src/qqnt/apis/file.d.ts
index 6d607572..55655608 100644
--- a/src/core.lib/src/qqnt/apis/file.d.ts
+++ b/src/core.lib/src/qqnt/apis/file.d.ts
@@ -1,4 +1,4 @@
-import { ChatType, ElementType } from '@/core/qqnt/entities';
+import { ChatType, ElementType } from '../../../../core/src/entities';
 import * as fileType from 'file-type';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 export declare class NTQQFileApi {
diff --git a/src/core.lib/src/qqnt/apis/file.js b/src/core.lib/src/qqnt/apis/file.js
index 97e97e3c..d7380b82 100644
--- a/src/core.lib/src/qqnt/apis/file.js
+++ b/src/core.lib/src/qqnt/apis/file.js
@@ -1 +1 @@
-const _0x473677=_0x1088;(function(_0x41615d,_0x1bbe87){const _0x2e4ba7=_0x1088,_0x4d3d64=_0x41615d();while(!![]){try{const _0x10aad3=parseInt(_0x2e4ba7(0xab))/0x1*(parseInt(_0x2e4ba7(0xb4))/0x2)+-parseInt(_0x2e4ba7(0xb3))/0x3*(-parseInt(_0x2e4ba7(0xc1))/0x4)+-parseInt(_0x2e4ba7(0xc5))/0x5+parseInt(_0x2e4ba7(0xc3))/0x6+-parseInt(_0x2e4ba7(0xaa))/0x7+-parseInt(_0x2e4ba7(0xc0))/0x8+-parseInt(_0x2e4ba7(0xa9))/0x9*(-parseInt(_0x2e4ba7(0xbe))/0xa);if(_0x10aad3===_0x1bbe87)break;else _0x4d3d64['push'](_0x4d3d64['shift']());}catch(_0x3b27a1){_0x4d3d64['push'](_0x4d3d64['shift']());}}}(_0x573e,0x68c21));import{ElementType}from'@/core/qqnt/entities';import _0x32fc46 from'path';function _0x1088(_0x128a7f,_0x1a7feb){const _0x573e5a=_0x573e();return _0x1088=function(_0x1088c2,_0x2088da){_0x1088c2=_0x1088c2-0xa6;let _0x43b4af=_0x573e5a[_0x1088c2];return _0x43b4af;},_0x1088(_0x128a7f,_0x1a7feb);}import _0x467baa from'fs';import{napCatCore}from'@/core';import{calculateFileMD5}from'@/common/utils/file';import*as _0x2747ca from'file-type';function _0x573e(){const _0x202a95=['3391825SjQoUR','msg','getFileSize','wrapper','getImageSize','baknI','addMsgListener','wEjLP','ext','86571iDJwkq','3669981WQcnMh','28869oPFnJn','downloadRichMedia','GLhIc','TWJeJ','util','existsSync','PIC','removeKernelMsgListener','589839MBTmGE','8INjGBu','kernelService','getFileType','下载超时','join','basename','service','copyFile','defaultFileDownloadPath','msgId','1600bFKCUA','HqeKG','2786912hcXjia','4aKftyy','getRichMediaFilePathForGuild','773832Tcorxz','IeZdI'];_0x573e=function(){return _0x202a95;};return _0x573e();}import{MsgListener}from'@/core/qqnt/listeners';import _0x42c77e from'image-size';import{sessionConfig}from'@/core/qqnt/sessionConfig';export class NTQQFileApi{static async[_0x473677(0xb6)](_0x30d542){return _0x2747ca['fileTypeFromFile'](_0x30d542);}static async[_0x473677(0xbb)](_0x2059fe,_0x42ec14){const _0x48dd83=_0x473677;await napCatCore[_0x48dd83(0xc8)][_0x48dd83(0xaf)][_0x48dd83(0xbb)](_0x2059fe,_0x42ec14);}static async[_0x473677(0xc7)](_0x1ad250){const _0x94dd46=_0x473677;return await napCatCore[_0x94dd46(0xc8)][_0x94dd46(0xaf)]['getFileSize'](_0x1ad250);}static async['uploadFile'](_0x175484,_0x5cdc69=ElementType[_0x473677(0xb1)],_0x4e17c9=0x0){const _0x1f3080=_0x473677,_0x284e8a={'IeZdI':function(_0xd6c5e6,_0xd812ae){return _0xd6c5e6(_0xd812ae);},'GLhIc':function(_0x5be464,_0x4ece6c){return _0x5be464+_0x4ece6c;},'baknI':function(_0x2383be,_0x7247e){return _0x2383be===_0x7247e;}},_0x1bb716=await _0x284e8a[_0x1f3080(0xc4)](calculateFileMD5,_0x175484);let _0x2467b9=(await NTQQFileApi['getFileType'](_0x175484))?.[_0x1f3080(0xa8)]||'';_0x2467b9&&(_0x2467b9=_0x284e8a[_0x1f3080(0xad)]('.',_0x2467b9));let _0x1c469b=''+_0x32fc46[_0x1f3080(0xb9)](_0x175484);_0x284e8a[_0x1f3080(0xca)](_0x1c469b['indexOf']('.'),-0x1)&&(_0x1c469b+=_0x2467b9);const _0xe45bab=napCatCore[_0x1f3080(0xba)][_0x1f3080(0xc6)][_0x1f3080(0xb5)][_0x1f3080(0xc2)]({'md5HexStr':_0x1bb716,'fileName':_0x1c469b,'elementType':_0x5cdc69,'elementSubType':_0x4e17c9,'thumbSize':0x0,'needCreate':!![],'downloadType':0x1,'file_uuid':''});await NTQQFileApi[_0x1f3080(0xbb)](_0x175484,_0xe45bab);const _0x2bddd9=await NTQQFileApi[_0x1f3080(0xc7)](_0x175484);return{'md5':_0x1bb716,'fileName':_0x1c469b,'path':_0xe45bab,'fileSize':_0x2bddd9,'ext':_0x2467b9};}static async['downloadMedia'](_0x3203b5,_0x39bc5d,_0x526fb1,_0x27c879,_0x316e27,_0x2ac718,_0x29d8fc=0x3e8*0x3c*0x2){const _0x5d1d33=_0x473677,_0x34ab3b={'HqeKG':_0x5d1d33(0xb7),'wEjLP':function(_0x4adf72,_0x9409fe,_0x551656){return _0x4adf72(_0x9409fe,_0x551656);}};if(_0x2ac718&&_0x467baa[_0x5d1d33(0xb0)](_0x2ac718))return _0x2ac718;const _0xf309e6=new MsgListener();return new Promise((_0x3da7d7,_0x54af01)=>{const _0x565c7e=_0x5d1d33,_0x1cf9af={'TWJeJ':function(_0x5b3b5c,_0x1ec074){return _0x5b3b5c(_0x1ec074);}};let _0x458f7e=![];_0xf309e6['onRichMediaDownloadComplete']=_0xd0be89=>{const _0x467511=_0x1088;if(_0xd0be89[_0x467511(0xbd)]===_0x3203b5){_0x458f7e=!![];let _0x3554d6=_0xd0be89['filePath'];if(_0x3554d6['startsWith']('\x5c')){const _0x42f2a2=sessionConfig?.[_0x467511(0xbc)];_0x3554d6=_0x32fc46[_0x467511(0xb8)](_0x42f2a2,_0x3554d6);}_0x1cf9af[_0x467511(0xae)](_0x3da7d7,_0x3554d6),napCatCore[_0x467511(0xba)]['msg'][_0x467511(0xb5)]?.[_0x467511(0xb2)](_0x65ecb1);}};const _0x65ecb1=napCatCore[_0x565c7e(0xba)][_0x565c7e(0xc6)][_0x565c7e(0xa6)](_0xf309e6);_0x34ab3b[_0x565c7e(0xa7)](setTimeout,()=>{const _0x56a042=_0x565c7e;!_0x458f7e&&(_0x54af01(new Error(_0x34ab3b[_0x56a042(0xbf)])),napCatCore['service'][_0x56a042(0xc6)]['kernelService']?.[_0x56a042(0xb2)](_0x65ecb1));},_0x29d8fc),napCatCore[_0x565c7e(0xba)][_0x565c7e(0xc6)][_0x565c7e(0xb5)]?.[_0x565c7e(0xac)]({'fileModelId':'0','downloadSourceType':0x0,'triggerType':0x1,'msgId':_0x3203b5,'chatType':_0x39bc5d,'peerUid':_0x526fb1,'elementId':_0x27c879,'thumbSize':0x0,'downloadType':0x1,'filePath':_0x316e27});});}static async[_0x473677(0xc9)](_0x2da229){return new Promise((_0x553e16,_0x1e0e7e)=>{_0x42c77e(_0x2da229,(_0x103d6,_0x1f3b3a)=>{_0x103d6?_0x1e0e7e(_0x103d6):_0x553e16(_0x1f3b3a);});});}}
\ No newline at end of file
+const _0x473677=_0x1088;(function(_0x41615d,_0x1bbe87){const _0x2e4ba7=_0x1088,_0x4d3d64=_0x41615d();while(!![]){try{const _0x10aad3=parseInt(_0x2e4ba7(0xab))/0x1*(parseInt(_0x2e4ba7(0xb4))/0x2)+-parseInt(_0x2e4ba7(0xb3))/0x3*(-parseInt(_0x2e4ba7(0xc1))/0x4)+-parseInt(_0x2e4ba7(0xc5))/0x5+parseInt(_0x2e4ba7(0xc3))/0x6+-parseInt(_0x2e4ba7(0xaa))/0x7+-parseInt(_0x2e4ba7(0xc0))/0x8+-parseInt(_0x2e4ba7(0xa9))/0x9*(-parseInt(_0x2e4ba7(0xbe))/0xa);if(_0x10aad3===_0x1bbe87)break;else _0x4d3d64['push'](_0x4d3d64['shift']());}catch(_0x3b27a1){_0x4d3d64['push'](_0x4d3d64['shift']());}}}(_0x573e,0x68c21));import{ElementType}from 'src/core/src/entities';import _0x32fc46 from'path';function _0x1088(_0x128a7f, _0x1a7feb){const _0x573e5a=_0x573e();return _0x1088=function(_0x1088c2, _0x2088da){_0x1088c2=_0x1088c2-0xa6;let _0x43b4af=_0x573e5a[_0x1088c2];return _0x43b4af;},_0x1088(_0x128a7f,_0x1a7feb);}import _0x467baa from'fs';import{napCatCore}from'@/core';import{calculateFileMD5}from'@/common/utils/file';import*as _0x2747ca from'file-type';function _0x573e(){const _0x202a95=['3391825SjQoUR','msg','getFileSize','wrapper','getImageSize','baknI','addMsgListener','wEjLP','ext','86571iDJwkq','3669981WQcnMh','28869oPFnJn','downloadRichMedia','GLhIc','TWJeJ','util','existsSync','PIC','removeKernelMsgListener','589839MBTmGE','8INjGBu','kernelService','getFileType','下载超时','join','basename','service','copyFile','defaultFileDownloadPath','msgId','1600bFKCUA','HqeKG','2786912hcXjia','4aKftyy','getRichMediaFilePathForGuild','773832Tcorxz','IeZdI'];_0x573e=function(){return _0x202a95;};return _0x573e();}import{MsgListener}from 'src/core/src/listeners';import _0x42c77e from'image-size';import{sessionConfig}from '@/core/sessionConfig.js';export class NTQQFileApi{static async[_0x473677(0xb6)](_0x30d542){return _0x2747ca['fileTypeFromFile'](_0x30d542);}static async[_0x473677(0xbb)](_0x2059fe, _0x42ec14){const _0x48dd83=_0x473677;await napCatCore[_0x48dd83(0xc8)][_0x48dd83(0xaf)][_0x48dd83(0xbb)](_0x2059fe,_0x42ec14);}static async[_0x473677(0xc7)](_0x1ad250){const _0x94dd46=_0x473677;return await napCatCore[_0x94dd46(0xc8)][_0x94dd46(0xaf)]['getFileSize'](_0x1ad250);}static async['uploadFile'](_0x175484, _0x5cdc69=ElementType[_0x473677(0xb1)], _0x4e17c9=0x0){const _0x1f3080=_0x473677,_0x284e8a={'IeZdI':function(_0xd6c5e6, _0xd812ae){return _0xd6c5e6(_0xd812ae);},'GLhIc':function(_0x5be464, _0x4ece6c){return _0x5be464+_0x4ece6c;},'baknI':function(_0x2383be, _0x7247e){return _0x2383be===_0x7247e;}},_0x1bb716=await _0x284e8a[_0x1f3080(0xc4)](calculateFileMD5,_0x175484);let _0x2467b9=(await NTQQFileApi['getFileType'](_0x175484))?.[_0x1f3080(0xa8)]||'';_0x2467b9&&(_0x2467b9=_0x284e8a[_0x1f3080(0xad)]('.',_0x2467b9));let _0x1c469b=''+_0x32fc46[_0x1f3080(0xb9)](_0x175484);_0x284e8a[_0x1f3080(0xca)](_0x1c469b['indexOf']('.'),-0x1)&&(_0x1c469b+=_0x2467b9);const _0xe45bab=napCatCore[_0x1f3080(0xba)][_0x1f3080(0xc6)][_0x1f3080(0xb5)][_0x1f3080(0xc2)]({'md5HexStr':_0x1bb716,'fileName':_0x1c469b,'elementType':_0x5cdc69,'elementSubType':_0x4e17c9,'thumbSize':0x0,'needCreate':!![],'downloadType':0x1,'file_uuid':''});await NTQQFileApi[_0x1f3080(0xbb)](_0x175484,_0xe45bab);const _0x2bddd9=await NTQQFileApi[_0x1f3080(0xc7)](_0x175484);return{'md5':_0x1bb716,'fileName':_0x1c469b,'path':_0xe45bab,'fileSize':_0x2bddd9,'ext':_0x2467b9};}static async['downloadMedia'](_0x3203b5, _0x39bc5d, _0x526fb1, _0x27c879, _0x316e27, _0x2ac718, _0x29d8fc=0x3e8*0x3c*0x2){const _0x5d1d33=_0x473677,_0x34ab3b={'HqeKG':_0x5d1d33(0xb7),'wEjLP':function(_0x4adf72, _0x9409fe, _0x551656){return _0x4adf72(_0x9409fe,_0x551656);}};if(_0x2ac718&&_0x467baa[_0x5d1d33(0xb0)](_0x2ac718))return _0x2ac718;const _0xf309e6=new MsgListener();return new Promise((_0x3da7d7, _0x54af01)=>{const _0x565c7e=_0x5d1d33,_0x1cf9af={'TWJeJ':function(_0x5b3b5c, _0x1ec074){return _0x5b3b5c(_0x1ec074);}};let _0x458f7e=![];_0xf309e6['onRichMediaDownloadComplete']= _0xd0be89=>{const _0x467511=_0x1088;if(_0xd0be89[_0x467511(0xbd)]===_0x3203b5){_0x458f7e=!![];let _0x3554d6=_0xd0be89['filePath'];if(_0x3554d6['startsWith']('\x5c')){const _0x42f2a2=sessionConfig?.[_0x467511(0xbc)];_0x3554d6=_0x32fc46[_0x467511(0xb8)](_0x42f2a2,_0x3554d6);}_0x1cf9af[_0x467511(0xae)](_0x3da7d7,_0x3554d6),napCatCore[_0x467511(0xba)]['msg'][_0x467511(0xb5)]?.[_0x467511(0xb2)](_0x65ecb1);}};const _0x65ecb1=napCatCore[_0x565c7e(0xba)][_0x565c7e(0xc6)][_0x565c7e(0xa6)](_0xf309e6);_0x34ab3b[_0x565c7e(0xa7)](setTimeout,()=>{const _0x56a042=_0x565c7e;!_0x458f7e&&(_0x54af01(new Error(_0x34ab3b[_0x56a042(0xbf)])),napCatCore['service'][_0x56a042(0xc6)]['kernelService']?.[_0x56a042(0xb2)](_0x65ecb1));},_0x29d8fc),napCatCore[_0x565c7e(0xba)][_0x565c7e(0xc6)][_0x565c7e(0xb5)]?.[_0x565c7e(0xac)]({'fileModelId':'0','downloadSourceType':0x0,'triggerType':0x1,'msgId':_0x3203b5,'chatType':_0x39bc5d,'peerUid':_0x526fb1,'elementId':_0x27c879,'thumbSize':0x0,'downloadType':0x1,'filePath':_0x316e27});});}static async[_0x473677(0xc9)](_0x2da229){return new Promise((_0x553e16, _0x1e0e7e)=>{_0x42c77e(_0x2da229,(_0x103d6, _0x1f3b3a)=>{_0x103d6?_0x1e0e7e(_0x103d6):_0x553e16(_0x1f3b3a);});});}}
diff --git a/src/core.lib/src/qqnt/apis/friend.d.ts b/src/core.lib/src/qqnt/apis/friend.d.ts
index 2b6e6f26..7a1b9745 100644
--- a/src/core.lib/src/qqnt/apis/friend.d.ts
+++ b/src/core.lib/src/qqnt/apis/friend.d.ts
@@ -1,4 +1,4 @@
-import { FriendRequest } from '@/core/qqnt/entities';
+import { FriendRequest } from '../../../../core/src/entities';
 export declare class NTQQFriendApi {
     static getFriends(forced?: boolean): Promise<void>;
     static handleFriendRequest(request: FriendRequest, accept: boolean): Promise<void>;
diff --git a/src/core.lib/src/qqnt/apis/group.js b/src/core.lib/src/qqnt/apis/group.js
index fc128e35..acf39049 100644
--- a/src/core.lib/src/qqnt/apis/group.js
+++ b/src/core.lib/src/qqnt/apis/group.js
@@ -1 +1 @@
-const _0xbcdb2c=_0x5189;(function(_0x262ec4,_0x3a2de8){const _0x27d148=_0x5189,_0x4461cf=_0x262ec4();while(!![]){try{const _0x36b476=parseInt(_0x27d148(0xea))/0x1*(parseInt(_0x27d148(0xd6))/0x2)+-parseInt(_0x27d148(0xde))/0x3*(-parseInt(_0x27d148(0xd1))/0x4)+-parseInt(_0x27d148(0xe7))/0x5*(parseInt(_0x27d148(0xf3))/0x6)+-parseInt(_0x27d148(0xd0))/0x7+-parseInt(_0x27d148(0xdc))/0x8*(-parseInt(_0x27d148(0xdb))/0x9)+parseInt(_0x27d148(0xd8))/0xa*(parseInt(_0x27d148(0xda))/0xb)+parseInt(_0x27d148(0xee))/0xc*(parseInt(_0x27d148(0xe4))/0xd);if(_0x36b476===_0x3a2de8)break;else _0x4461cf['push'](_0x4461cf['shift']());}catch(_0x8336f9){_0x4461cf['push'](_0x4461cf['shift']());}}}(_0x1c28,0xc82c1));import{napCatCore}from'@/core';function _0x5189(_0x4c6d52,_0x3610e1){const _0x1c2889=_0x1c28();return _0x5189=function(_0x5189ff,_0x4a0dd1){_0x5189ff=_0x5189ff-0xcd;let _0x21a3e5=_0x1c2889[_0x5189ff];return _0x21a3e5;},_0x5189(_0x4c6d52,_0x3610e1);}import{GroupListener}from'@/core/qqnt';export class NTQQGroupApi{static async[_0xbcdb2c(0xf6)](_0x2a9127=![]){const _0x6eeae8={'LOxeU':function(_0x5b7042,_0x4874af){return _0x5b7042(_0x4874af);},'KkMeq':function(_0x16cfd1,_0x2289d5){return _0x16cfd1(_0x2289d5);},'UQJlh':function(_0x203048,_0xef715d,_0x4d1119){return _0x203048(_0xef715d,_0x4d1119);}};let _0xb5da17=![];return new Promise((_0x339f47,_0x9a4e3e)=>{const _0x14ed27=_0x5189;_0x6eeae8[_0x14ed27(0xf2)](setTimeout,()=>{const _0x43355f=_0x14ed27;!_0xb5da17&&(napCatCore['service'][_0x43355f(0xdd)][_0x43355f(0xd3)]?.[_0x43355f(0xed)](_0x4593e7),_0x6eeae8['LOxeU'](_0x339f47,[]));},0x2710);const _0x2918dc=new GroupListener();_0x2918dc[_0x14ed27(0xf1)]=(_0x1a4588,_0x12d489)=>{const _0x52d79c=_0x14ed27;_0xb5da17=!![],_0x6eeae8['KkMeq'](_0x339f47,_0x12d489),napCatCore['service'][_0x52d79c(0xdd)][_0x52d79c(0xd3)]?.[_0x52d79c(0xed)](_0x4593e7);};const _0x4593e7=napCatCore[_0x14ed27(0xe8)][_0x14ed27(0xdd)][_0x14ed27(0xe2)](_0x2918dc);napCatCore['service']['group'][_0x14ed27(0xd3)]?.[_0x14ed27(0xe1)](_0x2a9127)[_0x14ed27(0xe3)]();});}static async[_0xbcdb2c(0xe6)](_0xf63e66,_0x4e7bed=0xbb8){}static async[_0xbcdb2c(0xe0)](){}static async[_0xbcdb2c(0xef)](){}static async[_0xbcdb2c(0xd2)](_0x101cd8,_0x39ae35,_0x656060){const _0x1ae387=_0xbcdb2c,_0x2e0b32={'SIyzE':function(_0x2e73c9,_0x53183e){return _0x2e73c9||_0x53183e;}};return napCatCore[_0x1ae387(0xe8)][_0x1ae387(0xdd)][_0x1ae387(0xd3)]?.[_0x1ae387(0xf5)](![],{'operateType':_0x39ae35,'targetMsg':{'seq':_0x101cd8['seq'],'type':_0x101cd8[_0x1ae387(0xdf)],'groupCode':_0x101cd8['group'][_0x1ae387(0xd9)],'postscript':_0x2e0b32['SIyzE'](_0x656060,'')}});}static async[_0xbcdb2c(0xcf)](_0x5ced3c){const _0x5461f2=_0xbcdb2c;return napCatCore[_0x5461f2(0xe8)][_0x5461f2(0xdd)][_0x5461f2(0xd3)]?.['quitGroup'](_0x5ced3c);}static async['kickMember'](_0x254c44,_0x2d71b1,_0x168733=![],_0x1549e0=''){const _0x590dd8=_0xbcdb2c;return napCatCore[_0x590dd8(0xe8)][_0x590dd8(0xdd)][_0x590dd8(0xd3)]?.[_0x590dd8(0xd5)](_0x254c44,_0x2d71b1,_0x168733,_0x1549e0);}static async['banMember'](_0x1c1aec,_0x454c68){const _0x507a3b=_0xbcdb2c;return napCatCore[_0x507a3b(0xe8)]['group'][_0x507a3b(0xd3)]?.[_0x507a3b(0xf0)](_0x1c1aec,_0x454c68);}static async[_0xbcdb2c(0xd7)](_0x198faf,_0x7c0718){const _0x29b156=_0xbcdb2c;return napCatCore[_0x29b156(0xe8)]['group'][_0x29b156(0xd3)]?.[_0x29b156(0xce)](_0x198faf,_0x7c0718);}static async['setMemberCard'](_0x31bcda,_0xd98112,_0x285c4c){const _0x544d97=_0xbcdb2c;return napCatCore['service']['group'][_0x544d97(0xd3)]?.[_0x544d97(0xd4)](_0x31bcda,_0xd98112,_0x285c4c);}static async[_0xbcdb2c(0xec)](_0x1e317a,_0x27e2ec,_0x5b9969){const _0x373120=_0xbcdb2c;return napCatCore['service'][_0x373120(0xdd)][_0x373120(0xd3)]?.[_0x373120(0xe5)](_0x1e317a,_0x27e2ec,_0x5b9969);}static async[_0xbcdb2c(0xeb)](_0x55a459,_0x3c1d62){const _0x38cacf=_0xbcdb2c;return napCatCore[_0x38cacf(0xe8)][_0x38cacf(0xdd)]['kernelService']?.[_0x38cacf(0xf4)](_0x55a459,_0x3c1d62,![]);}static async[_0xbcdb2c(0xcd)](_0x351fd7,_0x2fbbf4,_0x15884c){}static[_0xbcdb2c(0xe9)](_0x4ab14b,_0x5d19d9,_0x7267a4){}}function _0x1c28(){const _0x53cb2b=['37338xywSjW','modifyGroupName','operateSysNotify','getGroups','setGroupTitle','setGroupShutUp','quitGroup','10151064vTltUQ','1658936FcpKvp','handleGroupRequest','kernelService','modifyMemberCardName','kickMember','1045478nduRWM','banGroup','7518130dlxiUu','groupCode','11tPlZxS','4681791EQnama','24HwpaDi','group','3wfAwAv','type','getGroupNotifies','getGroupList','addGroupListener','then','934193BFaiCH','modifyMemberRole','getGroupMembers','845fYQpBo','service','publishGroupBulletin','1rAxGpz','setGroupName','setMemberRole','removeKernelGroupListener','12Htopgn','getGroupIgnoreNotifies','setMemberShutUp','onGroupListUpdate','UQJlh'];_0x1c28=function(){return _0x53cb2b;};return _0x1c28();}
\ No newline at end of file
+const _0xbcdb2c=_0x5189;(function(_0x262ec4,_0x3a2de8){const _0x27d148=_0x5189,_0x4461cf=_0x262ec4();while(!![]){try{const _0x36b476=parseInt(_0x27d148(0xea))/0x1*(parseInt(_0x27d148(0xd6))/0x2)+-parseInt(_0x27d148(0xde))/0x3*(-parseInt(_0x27d148(0xd1))/0x4)+-parseInt(_0x27d148(0xe7))/0x5*(parseInt(_0x27d148(0xf3))/0x6)+-parseInt(_0x27d148(0xd0))/0x7+-parseInt(_0x27d148(0xdc))/0x8*(-parseInt(_0x27d148(0xdb))/0x9)+parseInt(_0x27d148(0xd8))/0xa*(parseInt(_0x27d148(0xda))/0xb)+parseInt(_0x27d148(0xee))/0xc*(parseInt(_0x27d148(0xe4))/0xd);if(_0x36b476===_0x3a2de8)break;else _0x4461cf['push'](_0x4461cf['shift']());}catch(_0x8336f9){_0x4461cf['push'](_0x4461cf['shift']());}}}(_0x1c28,0xc82c1));import{napCatCore}from'@/core';function _0x5189(_0x4c6d52,_0x3610e1){const _0x1c2889=_0x1c28();return _0x5189=function(_0x5189ff,_0x4a0dd1){_0x5189ff=_0x5189ff-0xcd;let _0x21a3e5=_0x1c2889[_0x5189ff];return _0x21a3e5;},_0x5189(_0x4c6d52,_0x3610e1);}import{GroupListener}from '@/core';export class NTQQGroupApi{static async[_0xbcdb2c(0xf6)](_0x2a9127=![]){const _0x6eeae8={'LOxeU':function(_0x5b7042, _0x4874af){return _0x5b7042(_0x4874af);},'KkMeq':function(_0x16cfd1, _0x2289d5){return _0x16cfd1(_0x2289d5);},'UQJlh':function(_0x203048, _0xef715d, _0x4d1119){return _0x203048(_0xef715d,_0x4d1119);}};let _0xb5da17=![];return new Promise((_0x339f47, _0x9a4e3e)=>{const _0x14ed27=_0x5189;_0x6eeae8[_0x14ed27(0xf2)](setTimeout,()=>{const _0x43355f=_0x14ed27;!_0xb5da17&&(napCatCore['service'][_0x43355f(0xdd)][_0x43355f(0xd3)]?.[_0x43355f(0xed)](_0x4593e7),_0x6eeae8['LOxeU'](_0x339f47,[]));},0x2710);const _0x2918dc=new GroupListener();_0x2918dc[_0x14ed27(0xf1)]=(_0x1a4588, _0x12d489)=>{const _0x52d79c=_0x14ed27;_0xb5da17=!![],_0x6eeae8['KkMeq'](_0x339f47,_0x12d489),napCatCore['service'][_0x52d79c(0xdd)][_0x52d79c(0xd3)]?.[_0x52d79c(0xed)](_0x4593e7);};const _0x4593e7=napCatCore[_0x14ed27(0xe8)][_0x14ed27(0xdd)][_0x14ed27(0xe2)](_0x2918dc);napCatCore['service']['group'][_0x14ed27(0xd3)]?.[_0x14ed27(0xe1)](_0x2a9127)[_0x14ed27(0xe3)]();});}static async[_0xbcdb2c(0xe6)](_0xf63e66, _0x4e7bed=0xbb8){}static async[_0xbcdb2c(0xe0)](){}static async[_0xbcdb2c(0xef)](){}static async[_0xbcdb2c(0xd2)](_0x101cd8, _0x39ae35, _0x656060){const _0x1ae387=_0xbcdb2c,_0x2e0b32={'SIyzE':function(_0x2e73c9, _0x53183e){return _0x2e73c9||_0x53183e;}};return napCatCore[_0x1ae387(0xe8)][_0x1ae387(0xdd)][_0x1ae387(0xd3)]?.[_0x1ae387(0xf5)](![],{'operateType':_0x39ae35,'targetMsg':{'seq':_0x101cd8['seq'],'type':_0x101cd8[_0x1ae387(0xdf)],'groupCode':_0x101cd8['group'][_0x1ae387(0xd9)],'postscript':_0x2e0b32['SIyzE'](_0x656060,'')}});}static async[_0xbcdb2c(0xcf)](_0x5ced3c){const _0x5461f2=_0xbcdb2c;return napCatCore[_0x5461f2(0xe8)][_0x5461f2(0xdd)][_0x5461f2(0xd3)]?.['quitGroup'](_0x5ced3c);}static async['kickMember'](_0x254c44, _0x2d71b1, _0x168733=![], _0x1549e0=''){const _0x590dd8=_0xbcdb2c;return napCatCore[_0x590dd8(0xe8)][_0x590dd8(0xdd)][_0x590dd8(0xd3)]?.[_0x590dd8(0xd5)](_0x254c44,_0x2d71b1,_0x168733,_0x1549e0);}static async['banMember'](_0x1c1aec, _0x454c68){const _0x507a3b=_0xbcdb2c;return napCatCore[_0x507a3b(0xe8)]['group'][_0x507a3b(0xd3)]?.[_0x507a3b(0xf0)](_0x1c1aec,_0x454c68);}static async[_0xbcdb2c(0xd7)](_0x198faf, _0x7c0718){const _0x29b156=_0xbcdb2c;return napCatCore[_0x29b156(0xe8)]['group'][_0x29b156(0xd3)]?.[_0x29b156(0xce)](_0x198faf,_0x7c0718);}static async['setMemberCard'](_0x31bcda, _0xd98112, _0x285c4c){const _0x544d97=_0xbcdb2c;return napCatCore['service']['group'][_0x544d97(0xd3)]?.[_0x544d97(0xd4)](_0x31bcda,_0xd98112,_0x285c4c);}static async[_0xbcdb2c(0xec)](_0x1e317a, _0x27e2ec, _0x5b9969){const _0x373120=_0xbcdb2c;return napCatCore['service'][_0x373120(0xdd)][_0x373120(0xd3)]?.[_0x373120(0xe5)](_0x1e317a,_0x27e2ec,_0x5b9969);}static async[_0xbcdb2c(0xeb)](_0x55a459, _0x3c1d62){const _0x38cacf=_0xbcdb2c;return napCatCore[_0x38cacf(0xe8)][_0x38cacf(0xdd)]['kernelService']?.[_0x38cacf(0xf4)](_0x55a459,_0x3c1d62,![]);}static async[_0xbcdb2c(0xcd)](_0x351fd7, _0x2fbbf4, _0x15884c){}static[_0xbcdb2c(0xe9)](_0x4ab14b, _0x5d19d9, _0x7267a4){}}function _0x1c28(){const _0x53cb2b=['37338xywSjW','modifyGroupName','operateSysNotify','getGroups','setGroupTitle','setGroupShutUp','quitGroup','10151064vTltUQ','1658936FcpKvp','handleGroupRequest','kernelService','modifyMemberCardName','kickMember','1045478nduRWM','banGroup','7518130dlxiUu','groupCode','11tPlZxS','4681791EQnama','24HwpaDi','group','3wfAwAv','type','getGroupNotifies','getGroupList','addGroupListener','then','934193BFaiCH','modifyMemberRole','getGroupMembers','845fYQpBo','service','publishGroupBulletin','1rAxGpz','setGroupName','setMemberRole','removeKernelGroupListener','12Htopgn','getGroupIgnoreNotifies','setMemberShutUp','onGroupListUpdate','UQJlh'];_0x1c28=function(){return _0x53cb2b;};return _0x1c28();}
diff --git a/src/core.lib/src/qqnt/apis/msg.d.ts b/src/core.lib/src/qqnt/apis/msg.d.ts
index 77062a1e..a250de8e 100644
--- a/src/core.lib/src/qqnt/apis/msg.d.ts
+++ b/src/core.lib/src/qqnt/apis/msg.d.ts
@@ -1,6 +1,6 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
+import { Peer, RawMessage, SendMessageElement } from '../../../../core/src/entities';
 import { NapCatCore } from '@/core';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
 export declare class NTQQMsgApi {
     static napCatCore: NapCatCore | null;
     static getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
diff --git a/src/core.lib/src/qqnt/apis/msg.js b/src/core.lib/src/qqnt/apis/msg.js
index c4969d8c..4fb0cf2c 100644
--- a/src/core.lib/src/qqnt/apis/msg.js
+++ b/src/core.lib/src/qqnt/apis/msg.js
@@ -1 +1 @@
-const _0x222d01=_0x364f;(function(_0x15138a,_0x5508ca){const _0x29b39c=_0x364f,_0x57b48b=_0x15138a();while(!![]){try{const _0x5ab353=-parseInt(_0x29b39c(0x1d2))/0x1*(parseInt(_0x29b39c(0x1c2))/0x2)+parseInt(_0x29b39c(0x1bb))/0x3*(-parseInt(_0x29b39c(0x1cd))/0x4)+parseInt(_0x29b39c(0x1c7))/0x5*(-parseInt(_0x29b39c(0x1d6))/0x6)+-parseInt(_0x29b39c(0x1d0))/0x7+parseInt(_0x29b39c(0x1d7))/0x8+-parseInt(_0x29b39c(0x1b5))/0x9+parseInt(_0x29b39c(0x1d8))/0xa*(parseInt(_0x29b39c(0x1b4))/0xb);if(_0x5ab353===_0x5508ca)break;else _0x57b48b['push'](_0x57b48b['shift']());}catch(_0x2d3fc4){_0x57b48b['push'](_0x57b48b['shift']());}}}(_0x4071,0x361a8));import{selfInfo}from'@/common/data';import{log}from'@/common/utils/log';import{sleep}from'@/common/utils/helper';import{napCatCore}from'@/core';import{MsgListener}from'@/core/qqnt/listeners';function _0x364f(_0x3bf5bc,_0x129fd3){const _0x4071c2=_0x4071();return _0x364f=function(_0x364f48,_0x42dbfc){_0x364f48=_0x364f48-0x1a2;let _0x83536c=_0x4071c2[_0x364f48];return _0x83536c;},_0x364f(_0x3bf5bc,_0x129fd3);}function _0x4071(){const _0x2a5477=['sendStatus','guildId','2442979bovWoT','forwardMsg','21HvtRFb','catch','forEach','msg','11922mYStNT','1745320SJOLNu','20XDVQBj','app','arkElement','com.tencent.multimsg','ElpFt','poEyp','eNdta','setMsgRead','ArDzB','service','parse','发送超时','OwlSo','wqZdH','kRNpl','addLoginSuccessCallback','SJebt','sendMsg','elements','onAddSendMsg','getMsgsIncludeSelf','9712439HrOddz','2862153rQJhFa','recallMsg','peerUid','activateChatAndGetHistory','addMsgListener','kernelService','9vwSRUx','getMultiMsg','msgId','map','then','NPMRX','nick','36638xFgwnj','uid','fetchRecentContact','MkBTx','find','945RvIXXE','bytesData','multiForwardMsgWithComment','chatType','IuPfz','转发消息超时','446932qibpGT'];_0x4071=function(){return _0x2a5477;};return _0x4071();}import{randomUUID}from'crypto';const sendMessagePool={},sendSuccessCBMap={},msgListener=new MsgListener();msgListener[_0x222d01(0x1b2)]=_0x366350=>{const _0x2beff0=_0x222d01,_0x4b0e82={'syosx':function(_0x13ac87,_0x3e0e3d){return _0x13ac87 instanceof _0x3e0e3d;}};if(sendMessagePool[_0x366350[_0x2beff0(0x1b7)]]){const _0x5743c8=sendMessagePool[_0x366350[_0x2beff0(0x1b7)]]?.(_0x366350);_0x4b0e82['syosx'](_0x5743c8,Promise)&&_0x5743c8[_0x2beff0(0x1bf)]()[_0x2beff0(0x1bf)](log);}},msgListener['onMsgInfoListUpdate']=_0x1fa7cc=>{const _0xc7232c=_0x222d01,_0x5cb4ac={'MkBTx':function(_0x1b0cdd,_0x5f4dae){return _0x1b0cdd(_0x5f4dae);},'ArDzB':function(_0x3ce202,_0x5a7224){return _0x3ce202 instanceof _0x5a7224;}};_0x1fa7cc[_0xc7232c(0x1d4)](_0x50d98c=>{const _0x17c781=_0xc7232c;new Promise((_0x12c5bf,_0x50ec04)=>{const _0x20020a=_0x364f;for(const _0x4d3699 in sendSuccessCBMap){const _0x4cc593=sendSuccessCBMap[_0x4d3699],_0x3238db=_0x5cb4ac[_0x20020a(0x1c5)](_0x4cc593,_0x50d98c),_0x225c09=_0x5b97c1=>{_0x5b97c1&&delete sendSuccessCBMap[_0x4d3699];};_0x5cb4ac[_0x20020a(0x1a7)](_0x3238db,Promise)?_0x3238db[_0x20020a(0x1bf)](_0x225c09):_0x225c09(_0x3238db);}})[_0x17c781(0x1bf)]()[_0x17c781(0x1d3)](log);});},setTimeout(()=>{const _0x4cdf98=_0x222d01;napCatCore[_0x4cdf98(0x1ae)](()=>{const _0x3e822e=_0x4cdf98;napCatCore[_0x3e822e(0x1a8)]['msg'][_0x3e822e(0x1b9)](msgListener);});},0x64);export class NTQQMsgApi{static ['napCatCore']=null;static async[_0x222d01(0x1bc)](_0x13f379,_0x26ae1e,_0x42f921){const _0x135de2=_0x222d01;return napCatCore[_0x135de2(0x1a8)][_0x135de2(0x1d5)][_0x135de2(0x1ba)]?.[_0x135de2(0x1bc)](_0x13f379,_0x26ae1e,_0x42f921);}static async['activateChat'](_0x390b6e){}static async[_0x222d01(0x1b8)](_0x2ece00){}static async['setMsgRead'](_0x2da7ff){const _0x13e269=_0x222d01;return napCatCore[_0x13e269(0x1a8)][_0x13e269(0x1d5)][_0x13e269(0x1ba)][_0x13e269(0x1a6)](_0x2da7ff['chatType'],_0x2da7ff[_0x13e269(0x1b7)],_0x2da7ff[_0x13e269(0x1cf)]);}static async['getMsgHistory'](_0x9a8ce2,_0x653fe4,_0x10a03b){const _0x2afe38=_0x222d01;return napCatCore[_0x2afe38(0x1a8)][_0x2afe38(0x1d5)][_0x2afe38(0x1ba)][_0x2afe38(0x1b3)](_0x9a8ce2,_0x653fe4,_0x10a03b,!![]);}static async[_0x222d01(0x1c4)](){}static async[_0x222d01(0x1b6)](_0x57e794,_0x444f51){const _0x3862fc=_0x222d01;await napCatCore[_0x3862fc(0x1a8)][_0x3862fc(0x1d5)][_0x3862fc(0x1ba)]?.['recallMsg']({'chatType':_0x57e794[_0x3862fc(0x1ca)],'peerUid':_0x57e794[_0x3862fc(0x1b7)]},_0x444f51);}static async[_0x222d01(0x1b0)](_0x7a5e01,_0x4d50d2,_0x41f771=!![],_0x2f2865=0x2710){const _0x2dde1f=_0x222d01,_0x67ce76={'kRNpl':function(_0x4b50c2,_0x1f2b4c){return _0x4b50c2(_0x1f2b4c);},'OwlSo':function(_0x4dbc14,_0x3d3181){return _0x4dbc14(_0x3d3181);},'wqZdH':_0x2dde1f(0x1aa),'Bksjk':function(_0x41c2c7){return _0x41c2c7();}},_0xeffdfa=_0x7a5e01[_0x2dde1f(0x1b7)];let _0x227c40=0x0;const _0x445e11=async()=>{const _0x1f6ae1=_0x2dde1f;if(_0x227c40>_0x2f2865)throw'发送超时';const _0x302f77=sendMessagePool[_0x7a5e01[_0x1f6ae1(0x1b7)]];if(_0x302f77)return await _0x67ce76[_0x1f6ae1(0x1ad)](sleep,0x1f4),_0x227c40+=0x1f4,await _0x445e11();else return;};return await _0x445e11(),new Promise((_0x31a98a,_0x28f203)=>{const _0x36f401=_0x2dde1f,_0x3766c6={'NPMRX':function(_0x2423b4,_0x4db309){const _0xf1fcfc=_0x364f;return _0x67ce76[_0xf1fcfc(0x1ab)](_0x2423b4,_0x4db309);},'OBvUT':function(_0x431d9e,_0x3ef95c){return _0x431d9e(_0x3ef95c);},'IuPfz':_0x67ce76[_0x36f401(0x1ac)]};let _0x317519=![],_0x1a1f27=null;const _0x38d832=_0x67ce76['Bksjk'](randomUUID);sendSuccessCBMap[_0x38d832]=_0x5121fd=>{const _0x23b8b2=_0x36f401;if(_0x5121fd[_0x23b8b2(0x1bd)]===_0x1a1f27?.[_0x23b8b2(0x1bd)]){if(_0x5121fd[_0x23b8b2(0x1ce)]===0x2)return delete sendSuccessCBMap[_0x38d832],_0x317519=!![],_0x3766c6[_0x23b8b2(0x1c0)](_0x31a98a,_0x5121fd),!![];return![];}return![];},sendMessagePool[_0xeffdfa]=async _0x5c9bef=>{delete sendMessagePool[_0xeffdfa],_0x1a1f27=_0x5c9bef;},setTimeout(()=>{const _0x1a6c24=_0x36f401;if(_0x317519)return;delete sendMessagePool[_0xeffdfa],delete sendSuccessCBMap[_0x38d832],_0x3766c6['OBvUT'](_0x28f203,_0x3766c6[_0x1a6c24(0x1cb)]);},_0x2f2865);const _0xcb5ea6=napCatCore[_0x36f401(0x1a8)][_0x36f401(0x1d5)][_0x36f401(0x1ba)]?.['sendMsg']('0',_0x7a5e01,_0x4d50d2,new Map());});}static async[_0x222d01(0x1d1)](_0x4e5968,_0x499fdf,_0xfc2e8){}static async['multiForwardMsg'](_0x213df6,_0xbf27b3,_0x458467){const _0x89ac13=_0x222d01,_0x331ef3={'poEyp':function(_0x219f5c,_0x13e009){return _0x219f5c==_0x13e009;},'ElpFt':function(_0x222392,_0x1d8fad){return _0x222392==_0x1d8fad;},'SJebt':function(_0x28d546,_0x26a87a){return _0x28d546(_0x26a87a);},'vJmyB':_0x89ac13(0x1cc),'eNdta':function(_0x2b0c5f,_0x4281b4,_0x4ae4ae){return _0x2b0c5f(_0x4281b4,_0x4ae4ae);}},_0x425b29=_0x458467[_0x89ac13(0x1be)](_0x323632=>{const _0x3618d1=_0x89ac13;return{'msgId':_0x323632,'senderShowName':selfInfo[_0x3618d1(0x1c1)]};});return new Promise((_0x1b13db,_0x101af7)=>{const _0x17104a=_0x89ac13;let _0x4a2c9e=![];const _0x44c6b0=new MsgListener(),_0x7f4ca4=_0x4d1658=>{const _0xce710=_0x364f,_0x5a0ca7=_0x4d1658[_0xce710(0x1b1)][_0xce710(0x1c6)](_0x5d7c35=>_0x5d7c35[_0xce710(0x1da)]);if(!_0x5a0ca7)return;const _0x17541f=JSON[_0xce710(0x1a9)](_0x5a0ca7[_0xce710(0x1da)][_0xce710(0x1c8)]);if(_0x17541f[_0xce710(0x1d9)]!=_0xce710(0x1a2))return;_0x331ef3[_0xce710(0x1a4)](_0x4d1658[_0xce710(0x1b7)],_0xbf27b3[_0xce710(0x1b7)])&&_0x331ef3[_0xce710(0x1a3)](_0x4d1658['senderUid'],selfInfo[_0xce710(0x1c3)])&&(_0x4a2c9e=!![],napCatCore[_0xce710(0x1a8)]['msg']['kernelService']?.['removeKernelMsgListener'](_0x5a1a0b),_0x331ef3[_0xce710(0x1af)](_0x1b13db,_0x4d1658));};_0x44c6b0[_0x17104a(0x1b2)]=_0x7f4ca4;const _0x5a1a0b=napCatCore[_0x17104a(0x1a8)]['msg'][_0x17104a(0x1b9)](_0x44c6b0);_0x331ef3[_0x17104a(0x1a5)](setTimeout,()=>{const _0x154678=_0x17104a;!_0x4a2c9e&&(napCatCore['service']['msg']['kernelService']?.['removeKernelMsgListener'](_0x5a1a0b),_0x331ef3[_0x154678(0x1af)](_0x101af7,_0x331ef3['vJmyB']));},0x1388),napCatCore[_0x17104a(0x1a8)][_0x17104a(0x1d5)]['kernelService']?.[_0x17104a(0x1c9)](_0x425b29,_0x213df6,_0xbf27b3,[],new Map());});}}
\ No newline at end of file
+const _0x222d01=_0x364f;(function(_0x15138a,_0x5508ca){const _0x29b39c=_0x364f,_0x57b48b=_0x15138a();while(!![]){try{const _0x5ab353=-parseInt(_0x29b39c(0x1d2))/0x1*(parseInt(_0x29b39c(0x1c2))/0x2)+parseInt(_0x29b39c(0x1bb))/0x3*(-parseInt(_0x29b39c(0x1cd))/0x4)+parseInt(_0x29b39c(0x1c7))/0x5*(-parseInt(_0x29b39c(0x1d6))/0x6)+-parseInt(_0x29b39c(0x1d0))/0x7+parseInt(_0x29b39c(0x1d7))/0x8+-parseInt(_0x29b39c(0x1b5))/0x9+parseInt(_0x29b39c(0x1d8))/0xa*(parseInt(_0x29b39c(0x1b4))/0xb);if(_0x5ab353===_0x5508ca)break;else _0x57b48b['push'](_0x57b48b['shift']());}catch(_0x2d3fc4){_0x57b48b['push'](_0x57b48b['shift']());}}}(_0x4071,0x361a8));import{selfInfo}from'@/common/data';import{log}from'@/common/utils/log';import{sleep}from'@/common/utils/helper';import{napCatCore}from'@/core';import{MsgListener}from 'src/core/src/listeners';function _0x364f(_0x3bf5bc, _0x129fd3){const _0x4071c2=_0x4071();return _0x364f=function(_0x364f48, _0x42dbfc){_0x364f48=_0x364f48-0x1a2;let _0x83536c=_0x4071c2[_0x364f48];return _0x83536c;},_0x364f(_0x3bf5bc,_0x129fd3);}function _0x4071(){const _0x2a5477=['sendStatus','guildId','2442979bovWoT','forwardMsg','21HvtRFb','catch','forEach','msg','11922mYStNT','1745320SJOLNu','20XDVQBj','app','arkElement','com.tencent.multimsg','ElpFt','poEyp','eNdta','setMsgRead','ArDzB','service','parse','发送超时','OwlSo','wqZdH','kRNpl','addLoginSuccessCallback','SJebt','sendMsg','elements','onAddSendMsg','getMsgsIncludeSelf','9712439HrOddz','2862153rQJhFa','recallMsg','peerUid','activateChatAndGetHistory','addMsgListener','kernelService','9vwSRUx','getMultiMsg','msgId','map','then','NPMRX','nick','36638xFgwnj','uid','fetchRecentContact','MkBTx','find','945RvIXXE','bytesData','multiForwardMsgWithComment','chatType','IuPfz','转发消息超时','446932qibpGT'];_0x4071=function(){return _0x2a5477;};return _0x4071();}import{randomUUID}from'crypto';const sendMessagePool={},sendSuccessCBMap={},msgListener=new MsgListener();msgListener[_0x222d01(0x1b2)]= _0x366350=>{const _0x2beff0=_0x222d01,_0x4b0e82={'syosx':function(_0x13ac87, _0x3e0e3d){return _0x13ac87 instanceof _0x3e0e3d;}};if(sendMessagePool[_0x366350[_0x2beff0(0x1b7)]]){const _0x5743c8=sendMessagePool[_0x366350[_0x2beff0(0x1b7)]]?.(_0x366350);_0x4b0e82['syosx'](_0x5743c8,Promise)&&_0x5743c8[_0x2beff0(0x1bf)]()[_0x2beff0(0x1bf)](log);}},msgListener['onMsgInfoListUpdate']= _0x1fa7cc=>{const _0xc7232c=_0x222d01,_0x5cb4ac={'MkBTx':function(_0x1b0cdd, _0x5f4dae){return _0x1b0cdd(_0x5f4dae);},'ArDzB':function(_0x3ce202, _0x5a7224){return _0x3ce202 instanceof _0x5a7224;}};_0x1fa7cc[_0xc7232c(0x1d4)](_0x50d98c=>{const _0x17c781=_0xc7232c;new Promise((_0x12c5bf, _0x50ec04)=>{const _0x20020a=_0x364f;for(const _0x4d3699 in sendSuccessCBMap){const _0x4cc593=sendSuccessCBMap[_0x4d3699],_0x3238db=_0x5cb4ac[_0x20020a(0x1c5)](_0x4cc593,_0x50d98c),_0x225c09= _0x5b97c1=>{_0x5b97c1&&delete sendSuccessCBMap[_0x4d3699];};_0x5cb4ac[_0x20020a(0x1a7)](_0x3238db,Promise)?_0x3238db[_0x20020a(0x1bf)](_0x225c09):_0x225c09(_0x3238db);}})[_0x17c781(0x1bf)]()[_0x17c781(0x1d3)](log);});},setTimeout(()=>{const _0x4cdf98=_0x222d01;napCatCore[_0x4cdf98(0x1ae)](()=>{const _0x3e822e=_0x4cdf98;napCatCore[_0x3e822e(0x1a8)]['msg'][_0x3e822e(0x1b9)](msgListener);});},0x64);export class NTQQMsgApi{static ['napCatCore']=null;static async[_0x222d01(0x1bc)](_0x13f379, _0x26ae1e, _0x42f921){const _0x135de2=_0x222d01;return napCatCore[_0x135de2(0x1a8)][_0x135de2(0x1d5)][_0x135de2(0x1ba)]?.[_0x135de2(0x1bc)](_0x13f379,_0x26ae1e,_0x42f921);}static async['activateChat'](_0x390b6e){}static async[_0x222d01(0x1b8)](_0x2ece00){}static async['setMsgRead'](_0x2da7ff){const _0x13e269=_0x222d01;return napCatCore[_0x13e269(0x1a8)][_0x13e269(0x1d5)][_0x13e269(0x1ba)][_0x13e269(0x1a6)](_0x2da7ff['chatType'],_0x2da7ff[_0x13e269(0x1b7)],_0x2da7ff[_0x13e269(0x1cf)]);}static async['getMsgHistory'](_0x9a8ce2, _0x653fe4, _0x10a03b){const _0x2afe38=_0x222d01;return napCatCore[_0x2afe38(0x1a8)][_0x2afe38(0x1d5)][_0x2afe38(0x1ba)][_0x2afe38(0x1b3)](_0x9a8ce2,_0x653fe4,_0x10a03b,!![]);}static async[_0x222d01(0x1c4)](){}static async[_0x222d01(0x1b6)](_0x57e794, _0x444f51){const _0x3862fc=_0x222d01;await napCatCore[_0x3862fc(0x1a8)][_0x3862fc(0x1d5)][_0x3862fc(0x1ba)]?.['recallMsg']({'chatType':_0x57e794[_0x3862fc(0x1ca)],'peerUid':_0x57e794[_0x3862fc(0x1b7)]},_0x444f51);}static async[_0x222d01(0x1b0)](_0x7a5e01, _0x4d50d2, _0x41f771=!![], _0x2f2865=0x2710){const _0x2dde1f=_0x222d01,_0x67ce76={'kRNpl':function(_0x4b50c2, _0x1f2b4c){return _0x4b50c2(_0x1f2b4c);},'OwlSo':function(_0x4dbc14, _0x3d3181){return _0x4dbc14(_0x3d3181);},'wqZdH':_0x2dde1f(0x1aa),'Bksjk':function(_0x41c2c7){return _0x41c2c7();}},_0xeffdfa=_0x7a5e01[_0x2dde1f(0x1b7)];let _0x227c40=0x0;const _0x445e11=async()=>{const _0x1f6ae1=_0x2dde1f;if(_0x227c40>_0x2f2865)throw'发送超时';const _0x302f77=sendMessagePool[_0x7a5e01[_0x1f6ae1(0x1b7)]];if(_0x302f77)return await _0x67ce76[_0x1f6ae1(0x1ad)](sleep,0x1f4),_0x227c40+=0x1f4,await _0x445e11();else return;};return await _0x445e11(),new Promise((_0x31a98a, _0x28f203)=>{const _0x36f401=_0x2dde1f,_0x3766c6={'NPMRX':function(_0x2423b4, _0x4db309){const _0xf1fcfc=_0x364f;return _0x67ce76[_0xf1fcfc(0x1ab)](_0x2423b4,_0x4db309);},'OBvUT':function(_0x431d9e, _0x3ef95c){return _0x431d9e(_0x3ef95c);},'IuPfz':_0x67ce76[_0x36f401(0x1ac)]};let _0x317519=![],_0x1a1f27=null;const _0x38d832=_0x67ce76['Bksjk'](randomUUID);sendSuccessCBMap[_0x38d832]= _0x5121fd=>{const _0x23b8b2=_0x36f401;if(_0x5121fd[_0x23b8b2(0x1bd)]===_0x1a1f27?.[_0x23b8b2(0x1bd)]){if(_0x5121fd[_0x23b8b2(0x1ce)]===0x2)return delete sendSuccessCBMap[_0x38d832],_0x317519=!![],_0x3766c6[_0x23b8b2(0x1c0)](_0x31a98a,_0x5121fd),!![];return![];}return![];},sendMessagePool[_0xeffdfa]=async _0x5c9bef=>{delete sendMessagePool[_0xeffdfa],_0x1a1f27=_0x5c9bef;},setTimeout(()=>{const _0x1a6c24=_0x36f401;if(_0x317519)return;delete sendMessagePool[_0xeffdfa],delete sendSuccessCBMap[_0x38d832],_0x3766c6['OBvUT'](_0x28f203,_0x3766c6[_0x1a6c24(0x1cb)]);},_0x2f2865);const _0xcb5ea6=napCatCore[_0x36f401(0x1a8)][_0x36f401(0x1d5)][_0x36f401(0x1ba)]?.['sendMsg']('0',_0x7a5e01,_0x4d50d2,new Map());});}static async[_0x222d01(0x1d1)](_0x4e5968, _0x499fdf, _0xfc2e8){}static async['multiForwardMsg'](_0x213df6, _0xbf27b3, _0x458467){const _0x89ac13=_0x222d01,_0x331ef3={'poEyp':function(_0x219f5c, _0x13e009){return _0x219f5c==_0x13e009;},'ElpFt':function(_0x222392, _0x1d8fad){return _0x222392==_0x1d8fad;},'SJebt':function(_0x28d546, _0x26a87a){return _0x28d546(_0x26a87a);},'vJmyB':_0x89ac13(0x1cc),'eNdta':function(_0x2b0c5f, _0x4281b4, _0x4ae4ae){return _0x2b0c5f(_0x4281b4,_0x4ae4ae);}},_0x425b29=_0x458467[_0x89ac13(0x1be)](_0x323632=>{const _0x3618d1=_0x89ac13;return{'msgId':_0x323632,'senderShowName':selfInfo[_0x3618d1(0x1c1)]};});return new Promise((_0x1b13db, _0x101af7)=>{const _0x17104a=_0x89ac13;let _0x4a2c9e=![];const _0x44c6b0=new MsgListener(),_0x7f4ca4= _0x4d1658=>{const _0xce710=_0x364f,_0x5a0ca7=_0x4d1658[_0xce710(0x1b1)][_0xce710(0x1c6)](_0x5d7c35=>_0x5d7c35[_0xce710(0x1da)]);if(!_0x5a0ca7)return;const _0x17541f=JSON[_0xce710(0x1a9)](_0x5a0ca7[_0xce710(0x1da)][_0xce710(0x1c8)]);if(_0x17541f[_0xce710(0x1d9)]!=_0xce710(0x1a2))return;_0x331ef3[_0xce710(0x1a4)](_0x4d1658[_0xce710(0x1b7)],_0xbf27b3[_0xce710(0x1b7)])&&_0x331ef3[_0xce710(0x1a3)](_0x4d1658['senderUid'],selfInfo[_0xce710(0x1c3)])&&(_0x4a2c9e=!![],napCatCore[_0xce710(0x1a8)]['msg']['kernelService']?.['removeKernelMsgListener'](_0x5a1a0b),_0x331ef3[_0xce710(0x1af)](_0x1b13db,_0x4d1658));};_0x44c6b0[_0x17104a(0x1b2)]=_0x7f4ca4;const _0x5a1a0b=napCatCore[_0x17104a(0x1a8)]['msg'][_0x17104a(0x1b9)](_0x44c6b0);_0x331ef3[_0x17104a(0x1a5)](setTimeout,()=>{const _0x154678=_0x17104a;!_0x4a2c9e&&(napCatCore['service']['msg']['kernelService']?.['removeKernelMsgListener'](_0x5a1a0b),_0x331ef3[_0x154678(0x1af)](_0x101af7,_0x331ef3['vJmyB']));},0x1388),napCatCore[_0x17104a(0x1a8)][_0x17104a(0x1d5)]['kernelService']?.[_0x17104a(0x1c9)](_0x425b29,_0x213df6,_0xbf27b3,[],new Map());});}}
diff --git a/src/core.lib/src/qqnt/apis/user.d.ts b/src/core.lib/src/qqnt/apis/user.d.ts
index 408ec9ff..55b0d04a 100644
--- a/src/core.lib/src/qqnt/apis/user.d.ts
+++ b/src/core.lib/src/qqnt/apis/user.d.ts
@@ -1,4 +1,4 @@
-import { User } from '@/core/qqnt/entities';
+import { User } from '../../../../core/src/entities';
 export declare class NTQQUserApi {
     static like(uid: string, count?: number): Promise<{
         result: number;
diff --git a/src/core.lib/src/qqnt/apis/user.js b/src/core.lib/src/qqnt/apis/user.js
index 82451207..cc6a083e 100644
--- a/src/core.lib/src/qqnt/apis/user.js
+++ b/src/core.lib/src/qqnt/apis/user.js
@@ -1 +1 @@
-const _0x53bf1c=_0x3a99;(function(_0x582b4f,_0x2e9192){const _0x57dbbe=_0x3a99,_0x47da03=_0x582b4f();while(!![]){try{const _0x2ea51a=-parseInt(_0x57dbbe(0x187))/0x1+parseInt(_0x57dbbe(0x184))/0x2*(-parseInt(_0x57dbbe(0x172))/0x3)+-parseInt(_0x57dbbe(0x178))/0x4*(parseInt(_0x57dbbe(0x165))/0x5)+-parseInt(_0x57dbbe(0x175))/0x6*(parseInt(_0x57dbbe(0x17f))/0x7)+-parseInt(_0x57dbbe(0x17c))/0x8*(-parseInt(_0x57dbbe(0x180))/0x9)+parseInt(_0x57dbbe(0x16b))/0xa*(-parseInt(_0x57dbbe(0x189))/0xb)+-parseInt(_0x57dbbe(0x181))/0xc*(-parseInt(_0x57dbbe(0x185))/0xd);if(_0x2ea51a===_0x2e9192)break;else _0x47da03['push'](_0x47da03['shift']());}catch(_0x159d0f){_0x47da03['push'](_0x47da03['shift']());}}}(_0x24ae,0xacd2b));import{napCatCore}from'@/core';import{ProfileListener}from'@/core/qqnt/listeners';function _0x3a99(_0x115d88,_0x2a1bf3){const _0x24ae7e=_0x24ae();return _0x3a99=function(_0x3a990c,_0x1c3043){_0x3a990c=_0x3a990c-0x164;let _0x179f9d=_0x24ae7e[_0x3a990c];return _0x179f9d;},_0x3a99(_0x115d88,_0x2a1bf3);}import{randomUUID}from'crypto';const userInfoCache={},profileListener=new ProfileListener(),userDetailHandlers=new Map();profileListener[_0x53bf1c(0x170)]=_0x105fce=>{const _0x5aeae3=_0x53bf1c;userInfoCache[_0x105fce[_0x5aeae3(0x174)]]=_0x105fce,userDetailHandlers['forEach'](_0x4a5a1d=>_0x4a5a1d(_0x105fce));},setTimeout(()=>{const _0x3bf59b=_0x53bf1c;napCatCore[_0x3bf59b(0x16f)](()=>{const _0x119685=_0x3bf59b;napCatCore[_0x119685(0x186)][_0x119685(0x183)][_0x119685(0x17b)](profileListener);});},0x64);export class NTQQUserApi{static async['like'](_0x45c69a,_0x4cc6be=0x1){const _0x393f76=_0x53bf1c;return napCatCore['service'][_0x393f76(0x17e)]['kernelService'][_0x393f76(0x177)]({'friendUid':_0x45c69a,'sourceId':0x47,'doLikeCount':_0x4cc6be,'doLikeTollCount':0x0});}static async[_0x53bf1c(0x179)](_0x2f6f92){const _0x3dbe8e=_0x53bf1c,_0x41d3bd=napCatCore[_0x3dbe8e(0x186)][_0x3dbe8e(0x183)][_0x3dbe8e(0x171)]?.[_0x3dbe8e(0x16a)](_0x2f6f92);return{'result':_0x41d3bd?.[_0x3dbe8e(0x164)],'errMsg':_0x41d3bd?.['errMsg']};}static async[_0x53bf1c(0x168)](){}static async[_0x53bf1c(0x17a)](_0x8ac2a0){}static async[_0x53bf1c(0x169)](_0x5316e7){const _0x1166fd=_0x53bf1c,_0x178559={'nOrhd':function(_0x604b28,_0x6c2119){return _0x604b28===_0x6c2119;},'lvzsk':function(_0x633325,_0x14da98){return _0x633325(_0x14da98);},'fPysa':_0x1166fd(0x173),'xwEVA':function(_0xf1f80e){return _0xf1f80e();},'XsaQh':function(_0x223bfa,_0x53d5e5,_0x55db39){return _0x223bfa(_0x53d5e5,_0x55db39);}},_0x3a9687=napCatCore['service']['profile']['kernelService'];return new Promise((_0x34679b,_0x1e3c95)=>{const _0x4f33e3=_0x1166fd,_0x5e6a18={'NgZEB':_0x178559[_0x4f33e3(0x166)]},_0x1253ba=_0x178559['xwEVA'](randomUUID);let _0x9a2aaf=![];_0x178559[_0x4f33e3(0x176)](setTimeout,()=>{const _0x5df914=_0x4f33e3;!_0x9a2aaf&&_0x1e3c95(_0x5e6a18[_0x5df914(0x16d)]);},0x1388),userDetailHandlers[_0x4f33e3(0x17d)](_0x1253ba,_0x5594f2=>{const _0x548c24=_0x4f33e3;_0x178559['nOrhd'](_0x5594f2[_0x548c24(0x174)],_0x5316e7)&&(_0x9a2aaf=!![],userDetailHandlers[_0x548c24(0x182)](_0x1253ba),_0x178559[_0x548c24(0x16e)](_0x34679b,_0x5594f2));}),_0x3a9687[_0x4f33e3(0x16c)](_0x5316e7,[0x0])[_0x4f33e3(0x188)](_0x2b719c=>{});});}static async[_0x53bf1c(0x167)](){}static async['getSkey'](_0x186c09,_0x19483b){}}function _0x24ae(){const _0x31f7d6=['NgZEB','lvzsk','addLoginSuccessCallback','onProfileDetailInfoChanged','kernelService','2586bYPxzM','getUserDetailInfo\x20timeout','uid','1842BCiWpL','XsaQh','setBuddyProfileLike','28mRJodZ','setQQAvatar','getUserInfo','addProfileListener','2344RtvZDT','set','profileLike','31668EcasME','17586HPheEt','688596QSdHqN','delete','profile','2444apHmGJ','1170tdLKhn','service','759247cjDnPr','then','1117589GjrzNh','result','797455mPzIUL','fPysa','getPSkey','getSelfInfo','getUserDetailInfo','setHeader','70NNKrlp','getUserDetailInfoWithBizInfo'];_0x24ae=function(){return _0x31f7d6;};return _0x24ae();}
\ No newline at end of file
+const _0x53bf1c=_0x3a99;(function(_0x582b4f,_0x2e9192){const _0x57dbbe=_0x3a99,_0x47da03=_0x582b4f();while(!![]){try{const _0x2ea51a=-parseInt(_0x57dbbe(0x187))/0x1+parseInt(_0x57dbbe(0x184))/0x2*(-parseInt(_0x57dbbe(0x172))/0x3)+-parseInt(_0x57dbbe(0x178))/0x4*(parseInt(_0x57dbbe(0x165))/0x5)+-parseInt(_0x57dbbe(0x175))/0x6*(parseInt(_0x57dbbe(0x17f))/0x7)+-parseInt(_0x57dbbe(0x17c))/0x8*(-parseInt(_0x57dbbe(0x180))/0x9)+parseInt(_0x57dbbe(0x16b))/0xa*(-parseInt(_0x57dbbe(0x189))/0xb)+-parseInt(_0x57dbbe(0x181))/0xc*(-parseInt(_0x57dbbe(0x185))/0xd);if(_0x2ea51a===_0x2e9192)break;else _0x47da03['push'](_0x47da03['shift']());}catch(_0x159d0f){_0x47da03['push'](_0x47da03['shift']());}}}(_0x24ae,0xacd2b));import{napCatCore}from'@/core';import{ProfileListener}from 'src/core/src/listeners';function _0x3a99(_0x115d88, _0x2a1bf3){const _0x24ae7e=_0x24ae();return _0x3a99=function(_0x3a990c, _0x1c3043){_0x3a990c=_0x3a990c-0x164;let _0x179f9d=_0x24ae7e[_0x3a990c];return _0x179f9d;},_0x3a99(_0x115d88,_0x2a1bf3);}import{randomUUID}from'crypto';const userInfoCache={},profileListener=new ProfileListener(),userDetailHandlers=new Map();profileListener[_0x53bf1c(0x170)]= _0x105fce=>{const _0x5aeae3=_0x53bf1c;userInfoCache[_0x105fce[_0x5aeae3(0x174)]]=_0x105fce,userDetailHandlers['forEach'](_0x4a5a1d=>_0x4a5a1d(_0x105fce));},setTimeout(()=>{const _0x3bf59b=_0x53bf1c;napCatCore[_0x3bf59b(0x16f)](()=>{const _0x119685=_0x3bf59b;napCatCore[_0x119685(0x186)][_0x119685(0x183)][_0x119685(0x17b)](profileListener);});},0x64);export class NTQQUserApi{static async['like'](_0x45c69a, _0x4cc6be=0x1){const _0x393f76=_0x53bf1c;return napCatCore['service'][_0x393f76(0x17e)]['kernelService'][_0x393f76(0x177)]({'friendUid':_0x45c69a,'sourceId':0x47,'doLikeCount':_0x4cc6be,'doLikeTollCount':0x0});}static async[_0x53bf1c(0x179)](_0x2f6f92){const _0x3dbe8e=_0x53bf1c,_0x41d3bd=napCatCore[_0x3dbe8e(0x186)][_0x3dbe8e(0x183)][_0x3dbe8e(0x171)]?.[_0x3dbe8e(0x16a)](_0x2f6f92);return{'result':_0x41d3bd?.[_0x3dbe8e(0x164)],'errMsg':_0x41d3bd?.['errMsg']};}static async[_0x53bf1c(0x168)](){}static async[_0x53bf1c(0x17a)](_0x8ac2a0){}static async[_0x53bf1c(0x169)](_0x5316e7){const _0x1166fd=_0x53bf1c,_0x178559={'nOrhd':function(_0x604b28, _0x6c2119){return _0x604b28===_0x6c2119;},'lvzsk':function(_0x633325, _0x14da98){return _0x633325(_0x14da98);},'fPysa':_0x1166fd(0x173),'xwEVA':function(_0xf1f80e){return _0xf1f80e();},'XsaQh':function(_0x223bfa, _0x53d5e5, _0x55db39){return _0x223bfa(_0x53d5e5,_0x55db39);}},_0x3a9687=napCatCore['service']['profile']['kernelService'];return new Promise((_0x34679b, _0x1e3c95)=>{const _0x4f33e3=_0x1166fd,_0x5e6a18={'NgZEB':_0x178559[_0x4f33e3(0x166)]},_0x1253ba=_0x178559['xwEVA'](randomUUID);let _0x9a2aaf=![];_0x178559[_0x4f33e3(0x176)](setTimeout,()=>{const _0x5df914=_0x4f33e3;!_0x9a2aaf&&_0x1e3c95(_0x5e6a18[_0x5df914(0x16d)]);},0x1388),userDetailHandlers[_0x4f33e3(0x17d)](_0x1253ba, _0x5594f2=>{const _0x548c24=_0x4f33e3;_0x178559['nOrhd'](_0x5594f2[_0x548c24(0x174)],_0x5316e7)&&(_0x9a2aaf=!![],userDetailHandlers[_0x548c24(0x182)](_0x1253ba),_0x178559[_0x548c24(0x16e)](_0x34679b,_0x5594f2));}),_0x3a9687[_0x4f33e3(0x16c)](_0x5316e7,[0x0])[_0x4f33e3(0x188)](_0x2b719c=>{});});}static async[_0x53bf1c(0x167)](){}static async['getSkey'](_0x186c09, _0x19483b){}}function _0x24ae(){const _0x31f7d6=['NgZEB','lvzsk','addLoginSuccessCallback','onProfileDetailInfoChanged','kernelService','2586bYPxzM','getUserDetailInfo\x20timeout','uid','1842BCiWpL','XsaQh','setBuddyProfileLike','28mRJodZ','setQQAvatar','getUserInfo','addProfileListener','2344RtvZDT','set','profileLike','31668EcasME','17586HPheEt','688596QSdHqN','delete','profile','2444apHmGJ','1170tdLKhn','service','759247cjDnPr','then','1117589GjrzNh','result','797455mPzIUL','fPysa','getPSkey','getSelfInfo','getUserDetailInfo','setHeader','70NNKrlp','getUserDetailInfoWithBizInfo'];_0x24ae=function(){return _0x31f7d6;};return _0x24ae();}
diff --git a/src/core.lib/src/qqnt/entities/constructor.js b/src/core.lib/src/qqnt/entities/constructor.js
index c5212c98..1a47ddde 100644
--- a/src/core.lib/src/qqnt/entities/constructor.js
+++ b/src/core.lib/src/qqnt/entities/constructor.js
@@ -1 +1 @@
-function _0x4866(_0x4db6fc,_0x39ec2d){const _0x1ecfee=_0x1ecf();return _0x4866=function(_0x4866a3,_0x5b71f5){_0x4866a3=_0x4866a3-0x1c4;let _0x5522d2=_0x1ecfee[_0x4866a3];return _0x5522d2;},_0x4866(_0x4db6fc,_0x39ec2d);}const _0x1bd8e6=_0x4866;(function(_0x3ee66c,_0x1e432b){const _0x536fde=_0x4866,_0x4a1df1=_0x3ee66c();while(!![]){try{const _0x1501a6=parseInt(_0x536fde(0x1f2))/0x1*(parseInt(_0x536fde(0x1dc))/0x2)+-parseInt(_0x536fde(0x1f1))/0x3+-parseInt(_0x536fde(0x1d4))/0x4*(-parseInt(_0x536fde(0x1fe))/0x5)+parseInt(_0x536fde(0x1e9))/0x6*(-parseInt(_0x536fde(0x1c5))/0x7)+parseInt(_0x536fde(0x20f))/0x8+-parseInt(_0x536fde(0x213))/0x9+-parseInt(_0x536fde(0x202))/0xa*(parseInt(_0x536fde(0x1fb))/0xb);if(_0x1501a6===_0x1e432b)break;else _0x4a1df1['push'](_0x4a1df1['shift']());}catch(_0x460b73){_0x4a1df1['push'](_0x4a1df1['shift']());}}}(_0x1ecf,0x29414));import{AtType,ElementType,FaceIndex,FaceType,PicType}from'../entities';import{promises as _0x2cf348}from'node:fs';import _0x49cf5e from'fluent-ffmpeg';import{NTQQFileApi}from'@/core/qqnt/apis/file';import{calculateFileMD5,isGIF}from'@/common/utils/file';function _0x1ecf(){const _0x3253ab=['reply','time','14jJvwKS','unlink','REPLY','ElxSe','path','Yglco','mmgoc','FACE','FILE','stat','VIDEO','bSnyC','jpg','gVSbN','Thumb','796vIVGcO','then','uploadFile','获取视频信息失败','sep','notAt','wQIYS','ARK','188PbpQKv','_0.png','join','ptt','rps','error','set','replace','dirname','height','ark','rwVlt','toString','431646SpNkAW','[骰子]','PTT','normal','ECaJK','copyFile','ciuGx','gif','225159JOKyrJ','1533fZSmHo','QIPmY','iOnKx','ypRyz','mp4','MARKDOWN','face','Ori','catch','11YGzNgq','screenshots','TEXT','7455YJBANQ','dice','XMumh','UjsQW','875930chaAyE','文件异常，大小为0','WRGbJ','file','KsRNz','pic','markdown','获取视频封面失败，使用默认封面','width','getImageSize','peYgf','Tshtu','YTFHY','2525496RZiOuM','writeFile','NPPeY','CaaAv','2528910BlpfgO'];_0x1ecf=function(){return _0x3253ab;};return _0x1ecf();}import{log}from'@/common/utils/log';import{defaultVideoThumb,getVideoInfo}from'@/common/utils/video';import{encodeSilk}from'@/common/utils/audio';export class SendMsgElementConstructor{static['text'](_0x3afe95){const _0x1a9f16=_0x4866;return{'elementType':ElementType['TEXT'],'elementId':'','textElement':{'content':_0x3afe95,'atType':AtType[_0x1a9f16(0x1d9)],'atUid':'','atTinyId':'','atNtUid':''}};}static['at'](_0x1d0fcb,_0x2ebb8e,_0x1b61a5,_0x5b7dde){const _0x8ee597=_0x4866;return{'elementType':ElementType[_0x8ee597(0x1fd)],'elementId':'','textElement':{'content':'@'+_0x5b7dde,'atType':_0x1b61a5,'atUid':_0x1d0fcb,'atTinyId':'','atNtUid':_0x2ebb8e}};}static[_0x1bd8e6(0x214)](_0x2d43bb,_0x5bf5ce,_0x12ee77,_0x27d4f2){const _0x13a586=_0x1bd8e6;return{'elementType':ElementType[_0x13a586(0x1c7)],'elementId':'','replyElement':{'replayMsgSeq':_0x2d43bb,'replayMsgId':_0x5bf5ce,'senderUin':_0x12ee77,'senderUinStr':_0x27d4f2}};}static async[_0x1bd8e6(0x207)](_0x359976,_0x1e14ab='',_0x5efaf6=0x0){const _0x4209ba=_0x1bd8e6,_0x23ff73={'mmgoc':function(_0x4d70a7,_0x31ee3f){return _0x4d70a7===_0x31ee3f;},'NPPeY':'文件异常，大小为0','vvsoa':function(_0x25667e,_0xd4ec2c){return _0x25667e(_0xd4ec2c);},'bSnyC':function(_0x5d685b,_0x321d44,_0x5bb07e){return _0x5d685b(_0x321d44,_0x5bb07e);},'gVSbN':'图片信息'},{md5:_0x3ce3a0,fileName:_0x545a67,path:_0x28967c,fileSize:_0x3733d2}=await NTQQFileApi[_0x4209ba(0x1d6)](_0x359976,ElementType['PIC'],_0x5efaf6);if(_0x23ff73[_0x4209ba(0x1cb)](_0x3733d2,0x0))throw _0x23ff73[_0x4209ba(0x211)];const _0x2b0986=await NTQQFileApi[_0x4209ba(0x20b)](_0x359976),_0x528fea={'md5HexStr':_0x3ce3a0,'fileSize':_0x3733d2[_0x4209ba(0x1e8)](),'picWidth':_0x2b0986?.[_0x4209ba(0x20a)],'picHeight':_0x2b0986?.[_0x4209ba(0x1e5)],'fileName':_0x545a67,'sourcePath':_0x28967c,'original':!![],'picType':_0x23ff73['vvsoa'](isGIF,_0x359976)?PicType[_0x4209ba(0x1f0)]:PicType[_0x4209ba(0x1d1)],'picSubType':_0x5efaf6,'fileUuid':'','fileSubId':'','thumbFileSize':0x0,'summary':_0x1e14ab};return _0x23ff73[_0x4209ba(0x1d0)](log,_0x23ff73[_0x4209ba(0x1d2)],_0x528fea),{'elementType':ElementType['PIC'],'elementId':'','picElement':_0x528fea};}static async[_0x1bd8e6(0x205)](_0x110e43,_0x3274c3=''){const _0x5ca41f=_0x1bd8e6,_0x80093={'WRGbJ':_0x5ca41f(0x203)},{md5:_0x13bbc0,fileName:_0x415d5b,path:_0x4eb25f,fileSize:_0x5a5310}=await NTQQFileApi[_0x5ca41f(0x1d6)](_0x110e43,ElementType[_0x5ca41f(0x1cd)]);if(_0x5a5310===0x0)throw _0x80093[_0x5ca41f(0x204)];const _0x4e6132={'elementType':ElementType[_0x5ca41f(0x1cd)],'elementId':'','fileElement':{'fileName':_0x3274c3||_0x415d5b,'filePath':_0x4eb25f,'fileSize':_0x5a5310[_0x5ca41f(0x1e8)]()}};return _0x4e6132;}static async['video'](_0x435cbd,_0xf03860='',_0x3def75=''){const _0x34ba9a=_0x1bd8e6,_0x471387={'rwVlt':function(_0x523789,_0x4b3871,_0x403493){return _0x523789(_0x4b3871,_0x403493);},'iOnKx':_0x34ba9a(0x209),'Tshtu':function(_0x1b9701,_0x45801e){return _0x1b9701(_0x45801e);},'peYgf':'end','ElxSe':_0x34ba9a(0x1e1),'YRoHF':function(_0x60fc53,_0xb8f7f7){return _0x60fc53+_0xb8f7f7;},'ciuGx':function(_0x26b456,_0xedd2b2){return _0x26b456+_0xedd2b2;},'UcZXn':_0x34ba9a(0x203),'ECaJK':_0x34ba9a(0x1c9),'Yglco':_0x34ba9a(0x1f6),'KJkrr':function(_0x118845,_0x497911,_0x5a1465){return _0x118845(_0x497911,_0x5a1465);},'ypRyz':_0x34ba9a(0x1d7),'CaaAv':function(_0x1439f1,_0x4d46a5){return _0x1439f1(_0x4d46a5);},'YTFHY':function(_0x38afd6,_0x4f8e8d){return _0x38afd6||_0x4f8e8d;}},{fileName:_0x480535,path:_0xc51538,fileSize:_0x507eca,md5:_0x43797f}=await NTQQFileApi['uploadFile'](_0x435cbd,ElementType[_0x34ba9a(0x1cf)]);if(_0x507eca===0x0)throw _0x471387['UcZXn'];const _0x205145=require(_0x471387[_0x34ba9a(0x1ed)]);let _0x29946b=_0xc51538[_0x34ba9a(0x1e3)](_0x205145['sep']+_0x34ba9a(0x1f9)+_0x205145['sep'],_0x205145[_0x34ba9a(0x1d8)]+_0x34ba9a(0x1d3)+_0x205145[_0x34ba9a(0x1d8)]);_0x29946b=_0x205145[_0x34ba9a(0x1e4)](_0x29946b);let _0xd24f2={'width':0x780,'height':0x438,'time':0xf,'format':_0x471387[_0x34ba9a(0x1ca)],'size':_0x507eca,'filePath':_0x435cbd};try{_0xd24f2=await _0x471387['Tshtu'](getVideoInfo,_0xc51538),_0x471387['KJkrr'](log,'视频信息',_0xd24f2);}catch(_0x46da71){_0x471387[_0x34ba9a(0x1e7)](log,_0x471387[_0x34ba9a(0x1f5)],_0x46da71);}const _0x279c44=new Promise((_0x4ed102,_0x50946c)=>{const _0x5b6415=_0x34ba9a,_0x56cf28={'QIPmY':function(_0x27bd6c,_0x38ebe7){const _0x3ce24b=_0x4866;return _0x471387[_0x3ce24b(0x20d)](_0x27bd6c,_0x38ebe7);},'wQIYS':function(_0x555387,_0x4fd96b){return _0x555387(_0x4fd96b);}},_0x431a51=_0x43797f+_0x5b6415(0x1dd),_0x35e1b2=_0x205145[_0x5b6415(0x1de)](_0x29946b,_0x431a51);_0x471387[_0x5b6415(0x20d)](_0x49cf5e,_0x435cbd)['on'](_0x471387[_0x5b6415(0x20c)],()=>{})['on'](_0x471387[_0x5b6415(0x1c8)],_0x5b3608=>{const _0x470c0d=_0x5b6415;_0x471387[_0x470c0d(0x1e7)](log,_0x471387[_0x470c0d(0x1f4)],_0x5b3608),_0x3def75?_0x2cf348[_0x470c0d(0x1ee)](_0x3def75,_0x35e1b2)['then'](()=>{const _0x4e5ccc=_0x470c0d;_0x56cf28[_0x4e5ccc(0x1f3)](_0x4ed102,_0x35e1b2);})['catch'](_0x50946c):_0x2cf348[_0x470c0d(0x210)](_0x35e1b2,defaultVideoThumb)['then'](()=>{const _0x52963b=_0x470c0d;_0x56cf28[_0x52963b(0x1da)](_0x4ed102,_0x35e1b2);})[_0x470c0d(0x1fa)](_0x50946c);})[_0x5b6415(0x1fc)]({'timestamps':[0x0],'filename':_0x431a51,'folder':_0x29946b,'size':_0x471387['YRoHF'](_0x471387[_0x5b6415(0x1ef)](_0xd24f2[_0x5b6415(0x20a)],'x'),_0xd24f2[_0x5b6415(0x1e5)])})['on'](_0x471387['peYgf'],()=>{const _0x3e6bdd=_0x5b6415;_0x471387[_0x3e6bdd(0x20d)](_0x4ed102,_0x35e1b2);});}),_0x3ed7f9=new Map(),_0x2f29ce=await _0x279c44,_0x5c8287=(await _0x2cf348[_0x34ba9a(0x1ce)](_0x2f29ce))['size'];_0x3ed7f9[_0x34ba9a(0x1e2)](0x0,_0x2f29ce);const _0x3a53a1=await _0x471387[_0x34ba9a(0x212)](calculateFileMD5,_0x2f29ce),_0x4bba54={'elementType':ElementType[_0x34ba9a(0x1cf)],'elementId':'','videoElement':{'fileName':_0x471387[_0x34ba9a(0x20e)](_0xf03860,_0x480535),'filePath':_0xc51538,'videoMd5':_0x43797f,'thumbMd5':_0x3a53a1,'fileTime':_0xd24f2[_0x34ba9a(0x1c4)],'thumbPath':_0x3ed7f9,'thumbSize':_0x5c8287,'thumbWidth':_0xd24f2['width'],'thumbHeight':_0xd24f2[_0x34ba9a(0x1e5)],'fileSize':''+_0x507eca}};return _0x4bba54;}static async[_0x1bd8e6(0x1df)](_0x1d7392){const _0x32ca39=_0x1bd8e6,_0x48bd8c={'UjsQW':function(_0x2e2525,_0x22bfe1){return _0x2e2525(_0x22bfe1);},'XMumh':_0x32ca39(0x203)},{converted:_0x9afc7,path:_0x1d7b12,duration:_0x997e15}=await _0x48bd8c[_0x32ca39(0x201)](encodeSilk,_0x1d7392),{md5:_0x3278d7,fileName:_0x3c1de8,path:_0x1ec354,fileSize:_0x47b439}=await NTQQFileApi['uploadFile'](_0x1d7b12,ElementType[_0x32ca39(0x1eb)]);if(_0x47b439===0x0)throw _0x48bd8c[_0x32ca39(0x200)];return _0x9afc7&&_0x2cf348[_0x32ca39(0x1c6)](_0x1d7b12)[_0x32ca39(0x1d5)](),{'elementType':ElementType['PTT'],'elementId':'','pttElement':{'fileName':_0x3c1de8,'filePath':_0x1ec354,'md5HexStr':_0x3278d7,'fileSize':_0x47b439,'duration':_0x997e15||0x1,'formatType':0x1,'voiceType':0x1,'voiceChangeType':0x0,'canConvert2Text':!![],'waveAmplitudes':[0x0,0x12,0x9,0x17,0x10,0x11,0x10,0xf,0x2c,0x11,0x18,0x14,0xe,0xf,0x11],'fileSubId':'','playState':0x1,'autoConvertText':0x0}};}static[_0x1bd8e6(0x1f8)](_0x3fb4e1){const _0x41ff63=_0x1bd8e6,_0x11dec0={'KsRNz':function(_0x2af383,_0x13107f){return _0x2af383<_0x13107f;}};return{'elementType':ElementType['FACE'],'elementId':'','faceElement':{'faceIndex':_0x3fb4e1,'faceType':_0x11dec0[_0x41ff63(0x206)](_0x3fb4e1,0xde)?FaceType[_0x41ff63(0x1ec)]:FaceType['normal2']}};}static[_0x1bd8e6(0x1ff)](_0x1ca2c5){const _0x2ba664=_0x1bd8e6,_0x287d65={'KQtHH':_0x2ba664(0x1ea)};return{'elementType':ElementType[_0x2ba664(0x1cc)],'elementId':'','faceElement':{'faceIndex':FaceIndex[_0x2ba664(0x1ff)],'faceType':FaceType['dice'],'faceText':_0x287d65['KQtHH'],'packId':'1','stickerId':'33','sourceType':0x1,'stickerType':0x2,'surpriseId':''}};}static[_0x1bd8e6(0x1e0)](_0x430969){const _0x2fd11c=_0x1bd8e6;return{'elementType':ElementType[_0x2fd11c(0x1cc)],'elementId':'','faceElement':{'faceIndex':FaceIndex['RPS'],'faceText':'[包剪锤]','faceType':0x3,'packId':'1','stickerId':'34','sourceType':0x1,'stickerType':0x2,'surpriseId':''}};}static[_0x1bd8e6(0x1e6)](_0x5cfa7b){const _0x2f67c9=_0x1bd8e6;return{'elementType':ElementType[_0x2f67c9(0x1db)],'elementId':'','arkElement':{'bytesData':_0x5cfa7b,'linkInfo':null,'subElementType':null}};}static[_0x1bd8e6(0x208)](_0x206193){const _0x26e8e9=_0x1bd8e6;return{'elementType':ElementType[_0x26e8e9(0x1f7)],'elementId':'','markdownElement':{'content':_0x206193}};}}
\ No newline at end of file
+function _0x4866(_0x4db6fc,_0x39ec2d){const _0x1ecfee=_0x1ecf();return _0x4866=function(_0x4866a3,_0x5b71f5){_0x4866a3=_0x4866a3-0x1c4;let _0x5522d2=_0x1ecfee[_0x4866a3];return _0x5522d2;},_0x4866(_0x4db6fc,_0x39ec2d);}const _0x1bd8e6=_0x4866;(function(_0x3ee66c,_0x1e432b){const _0x536fde=_0x4866,_0x4a1df1=_0x3ee66c();while(!![]){try{const _0x1501a6=parseInt(_0x536fde(0x1f2))/0x1*(parseInt(_0x536fde(0x1dc))/0x2)+-parseInt(_0x536fde(0x1f1))/0x3+-parseInt(_0x536fde(0x1d4))/0x4*(-parseInt(_0x536fde(0x1fe))/0x5)+parseInt(_0x536fde(0x1e9))/0x6*(-parseInt(_0x536fde(0x1c5))/0x7)+parseInt(_0x536fde(0x20f))/0x8+-parseInt(_0x536fde(0x213))/0x9+-parseInt(_0x536fde(0x202))/0xa*(parseInt(_0x536fde(0x1fb))/0xb);if(_0x1501a6===_0x1e432b)break;else _0x4a1df1['push'](_0x4a1df1['shift']());}catch(_0x460b73){_0x4a1df1['push'](_0x4a1df1['shift']());}}}(_0x1ecf,0x29414));import{AtType,ElementType,FaceIndex,FaceType,PicType}from'../entities';import{promises as _0x2cf348}from'node:fs';import _0x49cf5e from'fluent-ffmpeg';import{NTQQFileApi}from '@/core/apis/file';import{calculateFileMD5,isGIF}from'@/common/utils/file';function _0x1ecf(){const _0x3253ab=['reply','time','14jJvwKS','unlink','REPLY','ElxSe','path','Yglco','mmgoc','FACE','FILE','stat','VIDEO','bSnyC','jpg','gVSbN','Thumb','796vIVGcO','then','uploadFile','获取视频信息失败','sep','notAt','wQIYS','ARK','188PbpQKv','_0.png','join','ptt','rps','error','set','replace','dirname','height','ark','rwVlt','toString','431646SpNkAW','[骰子]','PTT','normal','ECaJK','copyFile','ciuGx','gif','225159JOKyrJ','1533fZSmHo','QIPmY','iOnKx','ypRyz','mp4','MARKDOWN','face','Ori','catch','11YGzNgq','screenshots','TEXT','7455YJBANQ','dice','XMumh','UjsQW','875930chaAyE','文件异常，大小为0','WRGbJ','file','KsRNz','pic','markdown','获取视频封面失败，使用默认封面','width','getImageSize','peYgf','Tshtu','YTFHY','2525496RZiOuM','writeFile','NPPeY','CaaAv','2528910BlpfgO'];_0x1ecf=function(){return _0x3253ab;};return _0x1ecf();}import{log}from'@/common/utils/log';import{defaultVideoThumb,getVideoInfo}from'@/common/utils/video';import{encodeSilk}from'@/common/utils/audio';export class SendMsgElementConstructor{static['text'](_0x3afe95){const _0x1a9f16=_0x4866;return{'elementType':ElementType['TEXT'],'elementId':'','textElement':{'content':_0x3afe95,'atType':AtType[_0x1a9f16(0x1d9)],'atUid':'','atTinyId':'','atNtUid':''}};}static['at'](_0x1d0fcb, _0x2ebb8e, _0x1b61a5, _0x5b7dde){const _0x8ee597=_0x4866;return{'elementType':ElementType[_0x8ee597(0x1fd)],'elementId':'','textElement':{'content':'@'+_0x5b7dde,'atType':_0x1b61a5,'atUid':_0x1d0fcb,'atTinyId':'','atNtUid':_0x2ebb8e}};}static[_0x1bd8e6(0x214)](_0x2d43bb, _0x5bf5ce, _0x12ee77, _0x27d4f2){const _0x13a586=_0x1bd8e6;return{'elementType':ElementType[_0x13a586(0x1c7)],'elementId':'','replyElement':{'replayMsgSeq':_0x2d43bb,'replayMsgId':_0x5bf5ce,'senderUin':_0x12ee77,'senderUinStr':_0x27d4f2}};}static async[_0x1bd8e6(0x207)](_0x359976, _0x1e14ab='', _0x5efaf6=0x0){const _0x4209ba=_0x1bd8e6,_0x23ff73={'mmgoc':function(_0x4d70a7, _0x31ee3f){return _0x4d70a7===_0x31ee3f;},'NPPeY':'文件异常，大小为0','vvsoa':function(_0x25667e, _0xd4ec2c){return _0x25667e(_0xd4ec2c);},'bSnyC':function(_0x5d685b, _0x321d44, _0x5bb07e){return _0x5d685b(_0x321d44,_0x5bb07e);},'gVSbN':'图片信息'},{md5:_0x3ce3a0,fileName:_0x545a67,path:_0x28967c,fileSize:_0x3733d2}=await NTQQFileApi[_0x4209ba(0x1d6)](_0x359976,ElementType['PIC'],_0x5efaf6);if(_0x23ff73[_0x4209ba(0x1cb)](_0x3733d2,0x0))throw _0x23ff73[_0x4209ba(0x211)];const _0x2b0986=await NTQQFileApi[_0x4209ba(0x20b)](_0x359976),_0x528fea={'md5HexStr':_0x3ce3a0,'fileSize':_0x3733d2[_0x4209ba(0x1e8)](),'picWidth':_0x2b0986?.[_0x4209ba(0x20a)],'picHeight':_0x2b0986?.[_0x4209ba(0x1e5)],'fileName':_0x545a67,'sourcePath':_0x28967c,'original':!![],'picType':_0x23ff73['vvsoa'](isGIF,_0x359976)?PicType[_0x4209ba(0x1f0)]:PicType[_0x4209ba(0x1d1)],'picSubType':_0x5efaf6,'fileUuid':'','fileSubId':'','thumbFileSize':0x0,'summary':_0x1e14ab};return _0x23ff73[_0x4209ba(0x1d0)](log,_0x23ff73[_0x4209ba(0x1d2)],_0x528fea),{'elementType':ElementType['PIC'],'elementId':'','picElement':_0x528fea};}static async[_0x1bd8e6(0x205)](_0x110e43, _0x3274c3=''){const _0x5ca41f=_0x1bd8e6,_0x80093={'WRGbJ':_0x5ca41f(0x203)},{md5:_0x13bbc0,fileName:_0x415d5b,path:_0x4eb25f,fileSize:_0x5a5310}=await NTQQFileApi[_0x5ca41f(0x1d6)](_0x110e43,ElementType[_0x5ca41f(0x1cd)]);if(_0x5a5310===0x0)throw _0x80093[_0x5ca41f(0x204)];const _0x4e6132={'elementType':ElementType[_0x5ca41f(0x1cd)],'elementId':'','fileElement':{'fileName':_0x3274c3||_0x415d5b,'filePath':_0x4eb25f,'fileSize':_0x5a5310[_0x5ca41f(0x1e8)]()}};return _0x4e6132;}static async['video'](_0x435cbd, _0xf03860='', _0x3def75=''){const _0x34ba9a=_0x1bd8e6,_0x471387={'rwVlt':function(_0x523789, _0x4b3871, _0x403493){return _0x523789(_0x4b3871,_0x403493);},'iOnKx':_0x34ba9a(0x209),'Tshtu':function(_0x1b9701, _0x45801e){return _0x1b9701(_0x45801e);},'peYgf':'end','ElxSe':_0x34ba9a(0x1e1),'YRoHF':function(_0x60fc53, _0xb8f7f7){return _0x60fc53+_0xb8f7f7;},'ciuGx':function(_0x26b456, _0xedd2b2){return _0x26b456+_0xedd2b2;},'UcZXn':_0x34ba9a(0x203),'ECaJK':_0x34ba9a(0x1c9),'Yglco':_0x34ba9a(0x1f6),'KJkrr':function(_0x118845, _0x497911, _0x5a1465){return _0x118845(_0x497911,_0x5a1465);},'ypRyz':_0x34ba9a(0x1d7),'CaaAv':function(_0x1439f1, _0x4d46a5){return _0x1439f1(_0x4d46a5);},'YTFHY':function(_0x38afd6, _0x4f8e8d){return _0x38afd6||_0x4f8e8d;}},{fileName:_0x480535,path:_0xc51538,fileSize:_0x507eca,md5:_0x43797f}=await NTQQFileApi['uploadFile'](_0x435cbd,ElementType[_0x34ba9a(0x1cf)]);if(_0x507eca===0x0)throw _0x471387['UcZXn'];const _0x205145=require(_0x471387[_0x34ba9a(0x1ed)]);let _0x29946b=_0xc51538[_0x34ba9a(0x1e3)](_0x205145['sep']+_0x34ba9a(0x1f9)+_0x205145['sep'],_0x205145[_0x34ba9a(0x1d8)]+_0x34ba9a(0x1d3)+_0x205145[_0x34ba9a(0x1d8)]);_0x29946b=_0x205145[_0x34ba9a(0x1e4)](_0x29946b);let _0xd24f2={'width':0x780,'height':0x438,'time':0xf,'format':_0x471387[_0x34ba9a(0x1ca)],'size':_0x507eca,'filePath':_0x435cbd};try{_0xd24f2=await _0x471387['Tshtu'](getVideoInfo,_0xc51538),_0x471387['KJkrr'](log,'视频信息',_0xd24f2);}catch(_0x46da71){_0x471387[_0x34ba9a(0x1e7)](log,_0x471387[_0x34ba9a(0x1f5)],_0x46da71);}const _0x279c44=new Promise((_0x4ed102, _0x50946c)=>{const _0x5b6415=_0x34ba9a,_0x56cf28={'QIPmY':function(_0x27bd6c, _0x38ebe7){const _0x3ce24b=_0x4866;return _0x471387[_0x3ce24b(0x20d)](_0x27bd6c,_0x38ebe7);},'wQIYS':function(_0x555387, _0x4fd96b){return _0x555387(_0x4fd96b);}},_0x431a51=_0x43797f+_0x5b6415(0x1dd),_0x35e1b2=_0x205145[_0x5b6415(0x1de)](_0x29946b,_0x431a51);_0x471387[_0x5b6415(0x20d)](_0x49cf5e,_0x435cbd)['on'](_0x471387[_0x5b6415(0x20c)],()=>{})['on'](_0x471387[_0x5b6415(0x1c8)], _0x5b3608=>{const _0x470c0d=_0x5b6415;_0x471387[_0x470c0d(0x1e7)](log,_0x471387[_0x470c0d(0x1f4)],_0x5b3608),_0x3def75?_0x2cf348[_0x470c0d(0x1ee)](_0x3def75,_0x35e1b2)['then'](()=>{const _0x4e5ccc=_0x470c0d;_0x56cf28[_0x4e5ccc(0x1f3)](_0x4ed102,_0x35e1b2);})['catch'](_0x50946c):_0x2cf348[_0x470c0d(0x210)](_0x35e1b2,defaultVideoThumb)['then'](()=>{const _0x52963b=_0x470c0d;_0x56cf28[_0x52963b(0x1da)](_0x4ed102,_0x35e1b2);})[_0x470c0d(0x1fa)](_0x50946c);})[_0x5b6415(0x1fc)]({'timestamps':[0x0],'filename':_0x431a51,'folder':_0x29946b,'size':_0x471387['YRoHF'](_0x471387[_0x5b6415(0x1ef)](_0xd24f2[_0x5b6415(0x20a)],'x'),_0xd24f2[_0x5b6415(0x1e5)])})['on'](_0x471387['peYgf'],()=>{const _0x3e6bdd=_0x5b6415;_0x471387[_0x3e6bdd(0x20d)](_0x4ed102,_0x35e1b2);});}),_0x3ed7f9=new Map(),_0x2f29ce=await _0x279c44,_0x5c8287=(await _0x2cf348[_0x34ba9a(0x1ce)](_0x2f29ce))['size'];_0x3ed7f9[_0x34ba9a(0x1e2)](0x0,_0x2f29ce);const _0x3a53a1=await _0x471387[_0x34ba9a(0x212)](calculateFileMD5,_0x2f29ce),_0x4bba54={'elementType':ElementType[_0x34ba9a(0x1cf)],'elementId':'','videoElement':{'fileName':_0x471387[_0x34ba9a(0x20e)](_0xf03860,_0x480535),'filePath':_0xc51538,'videoMd5':_0x43797f,'thumbMd5':_0x3a53a1,'fileTime':_0xd24f2[_0x34ba9a(0x1c4)],'thumbPath':_0x3ed7f9,'thumbSize':_0x5c8287,'thumbWidth':_0xd24f2['width'],'thumbHeight':_0xd24f2[_0x34ba9a(0x1e5)],'fileSize':''+_0x507eca}};return _0x4bba54;}static async[_0x1bd8e6(0x1df)](_0x1d7392){const _0x32ca39=_0x1bd8e6,_0x48bd8c={'UjsQW':function(_0x2e2525, _0x22bfe1){return _0x2e2525(_0x22bfe1);},'XMumh':_0x32ca39(0x203)},{converted:_0x9afc7,path:_0x1d7b12,duration:_0x997e15}=await _0x48bd8c[_0x32ca39(0x201)](encodeSilk,_0x1d7392),{md5:_0x3278d7,fileName:_0x3c1de8,path:_0x1ec354,fileSize:_0x47b439}=await NTQQFileApi['uploadFile'](_0x1d7b12,ElementType[_0x32ca39(0x1eb)]);if(_0x47b439===0x0)throw _0x48bd8c[_0x32ca39(0x200)];return _0x9afc7&&_0x2cf348[_0x32ca39(0x1c6)](_0x1d7b12)[_0x32ca39(0x1d5)](),{'elementType':ElementType['PTT'],'elementId':'','pttElement':{'fileName':_0x3c1de8,'filePath':_0x1ec354,'md5HexStr':_0x3278d7,'fileSize':_0x47b439,'duration':_0x997e15||0x1,'formatType':0x1,'voiceType':0x1,'voiceChangeType':0x0,'canConvert2Text':!![],'waveAmplitudes':[0x0,0x12,0x9,0x17,0x10,0x11,0x10,0xf,0x2c,0x11,0x18,0x14,0xe,0xf,0x11],'fileSubId':'','playState':0x1,'autoConvertText':0x0}};}static[_0x1bd8e6(0x1f8)](_0x3fb4e1){const _0x41ff63=_0x1bd8e6,_0x11dec0={'KsRNz':function(_0x2af383, _0x13107f){return _0x2af383<_0x13107f;}};return{'elementType':ElementType['FACE'],'elementId':'','faceElement':{'faceIndex':_0x3fb4e1,'faceType':_0x11dec0[_0x41ff63(0x206)](_0x3fb4e1,0xde)?FaceType[_0x41ff63(0x1ec)]:FaceType['normal2']}};}static[_0x1bd8e6(0x1ff)](_0x1ca2c5){const _0x2ba664=_0x1bd8e6,_0x287d65={'KQtHH':_0x2ba664(0x1ea)};return{'elementType':ElementType[_0x2ba664(0x1cc)],'elementId':'','faceElement':{'faceIndex':FaceIndex[_0x2ba664(0x1ff)],'faceType':FaceType['dice'],'faceText':_0x287d65['KQtHH'],'packId':'1','stickerId':'33','sourceType':0x1,'stickerType':0x2,'surpriseId':''}};}static[_0x1bd8e6(0x1e0)](_0x430969){const _0x2fd11c=_0x1bd8e6;return{'elementType':ElementType[_0x2fd11c(0x1cc)],'elementId':'','faceElement':{'faceIndex':FaceIndex['RPS'],'faceText':'[包剪锤]','faceType':0x3,'packId':'1','stickerId':'34','sourceType':0x1,'stickerType':0x2,'surpriseId':''}};}static[_0x1bd8e6(0x1e6)](_0x5cfa7b){const _0x2f67c9=_0x1bd8e6;return{'elementType':ElementType[_0x2f67c9(0x1db)],'elementId':'','arkElement':{'bytesData':_0x5cfa7b,'linkInfo':null,'subElementType':null}};}static[_0x1bd8e6(0x208)](_0x206193){const _0x26e8e9=_0x1bd8e6;return{'elementType':ElementType[_0x26e8e9(0x1f7)],'elementId':'','markdownElement':{'content':_0x206193}};}}
diff --git a/src/core.lib/src/qqnt/listeners/NodeIKernelBuddyListener.d.ts b/src/core.lib/src/qqnt/listeners/NodeIKernelBuddyListener.d.ts
index aeede180..4c36cdee 100644
--- a/src/core.lib/src/qqnt/listeners/NodeIKernelBuddyListener.d.ts
+++ b/src/core.lib/src/qqnt/listeners/NodeIKernelBuddyListener.d.ts
@@ -1,4 +1,4 @@
-import { FriendRequestNotify, User } from '@/core/qqnt/entities';
+import { FriendRequestNotify, User } from '../../../../core/src/entities';
 interface IBuddyListener {
     onBuddyListChange(arg: {
         categoryId: number;
diff --git a/src/core.lib/src/qqnt/listeners/NodeIKernelGroupListener.d.ts b/src/core.lib/src/qqnt/listeners/NodeIKernelGroupListener.d.ts
index d8c75c28..a78ee026 100644
--- a/src/core.lib/src/qqnt/listeners/NodeIKernelGroupListener.d.ts
+++ b/src/core.lib/src/qqnt/listeners/NodeIKernelGroupListener.d.ts
@@ -1,4 +1,4 @@
-import { Group, GroupMember, GroupNotify } from '@/core/qqnt/entities';
+import { Group, GroupMember, GroupNotify } from '../../../../core/src/entities';
 interface IGroupListener {
     onGroupListUpdate(updateType: number, groupList: Group[]): void;
     onGroupExtListUpdate(...args: unknown[]): void;
diff --git a/src/core.lib/src/qqnt/listeners/NodeIKernelMsgListener.d.ts b/src/core.lib/src/qqnt/listeners/NodeIKernelMsgListener.d.ts
index dfe6d59f..bfa6a585 100644
--- a/src/core.lib/src/qqnt/listeners/NodeIKernelMsgListener.d.ts
+++ b/src/core.lib/src/qqnt/listeners/NodeIKernelMsgListener.d.ts
@@ -1,4 +1,4 @@
-import { RawMessage } from '@/core/qqnt/entities';
+import { RawMessage } from '../../../../core/src/entities';
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string;
     msgElementId: string;
diff --git a/src/core.lib/src/qqnt/listeners/NodeIKernelProfileListener .d.ts b/src/core.lib/src/qqnt/listeners/NodeIKernelProfileListener .d.ts
index 27840596..02205305 100644
--- a/src/core.lib/src/qqnt/listeners/NodeIKernelProfileListener .d.ts	
+++ b/src/core.lib/src/qqnt/listeners/NodeIKernelProfileListener .d.ts	
@@ -1,4 +1,4 @@
-import { User } from '@/core/qqnt/entities';
+import { User } from '../../../../core/src/entities';
 interface IProfileListener {
     onProfileSimpleChanged(...args: unknown[]): void;
     onProfileDetailInfoChanged(profile: User): void;
diff --git a/src/core.lib/src/qqnt/services/NodeIKernelBuddyService.d.ts b/src/core.lib/src/qqnt/services/NodeIKernelBuddyService.d.ts
index d6d4e461..60f70d45 100644
--- a/src/core.lib/src/qqnt/services/NodeIKernelBuddyService.d.ts
+++ b/src/core.lib/src/qqnt/services/NodeIKernelBuddyService.d.ts
@@ -1,6 +1,6 @@
-import { Friend } from '@/core/qqnt/entities';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
-import { NodeIKernelBuddyListener } from '@/core/qqnt/listeners';
+import { Friend } from '../../../../core/src/entities';
+import { GeneralCallResult } from '@/core/services/common';
+import { NodeIKernelBuddyListener } from '../../../../core/src/listeners';
 export interface NodeIKernelBuddyService {
     friends: Friend[];
     getFriend(uidOrUin: string): Promise<Friend>;
diff --git a/src/core.lib/src/qqnt/services/NodeIKernelGroupService.d.ts b/src/core.lib/src/qqnt/services/NodeIKernelGroupService.d.ts
index 5403c30c..36a7492b 100644
--- a/src/core.lib/src/qqnt/services/NodeIKernelGroupService.d.ts
+++ b/src/core.lib/src/qqnt/services/NodeIKernelGroupService.d.ts
@@ -1,6 +1,6 @@
-import { NodeIKernelGroupListener } from '@/core/qqnt/listeners/NodeIKernelGroupListener';
-import { GroupMember, GroupMemberRole, GroupNotifyTypes, GroupRequestOperateTypes } from '@/core/qqnt/entities';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { NodeIKernelGroupListener } from '@/core/listeners/NodeIKernelGroupListener';
+import { GroupMember, GroupMemberRole, GroupNotifyTypes, GroupRequestOperateTypes } from '../../../../core/src/entities';
+import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelGroupService {
     addKernelGroupListener(listener: NodeIKernelGroupListener): number;
     removeKernelGroupListener(listenerId: unknown): void;
diff --git a/src/core.lib/src/qqnt/services/NodeIKernelLoginService.d.ts b/src/core.lib/src/qqnt/services/NodeIKernelLoginService.d.ts
index d4f6d6bd..ec2e556c 100644
--- a/src/core.lib/src/qqnt/services/NodeIKernelLoginService.d.ts
+++ b/src/core.lib/src/qqnt/services/NodeIKernelLoginService.d.ts
@@ -1,4 +1,4 @@
-import { NodeIKernelLoginListener } from '@/core/qqnt/listeners/NodeIKernelLoginListener';
+import { NodeIKernelLoginListener } from '@/core/listeners/NodeIKernelLoginListener';
 export interface LoginInitConfig {
     machineId: '';
     appid: string;
diff --git a/src/core.lib/src/qqnt/services/NodeIKernelMsgService.d.ts b/src/core.lib/src/qqnt/services/NodeIKernelMsgService.d.ts
index 527e85aa..a7d170cd 100644
--- a/src/core.lib/src/qqnt/services/NodeIKernelMsgService.d.ts
+++ b/src/core.lib/src/qqnt/services/NodeIKernelMsgService.d.ts
@@ -1,6 +1,6 @@
-import { ChatType, ElementType, Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
-import { NodeIKernelMsgListener } from '@/core/qqnt/listeners/NodeIKernelMsgListener';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { ChatType, ElementType, Peer, RawMessage, SendMessageElement } from '../../../../core/src/entities';
+import { NodeIKernelMsgListener } from '@/core/listeners/NodeIKernelMsgListener';
+import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelMsgService {
     addKernelMsgListener(nodeIKernelMsgListener: NodeIKernelMsgListener): void;
     sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<unknown>;
diff --git a/src/core.lib/src/qqnt/services/NodeIKernelProfileService.d.ts b/src/core.lib/src/qqnt/services/NodeIKernelProfileService.d.ts
index ca3a2bd3..b477aced 100644
--- a/src/core.lib/src/qqnt/services/NodeIKernelProfileService.d.ts
+++ b/src/core.lib/src/qqnt/services/NodeIKernelProfileService.d.ts
@@ -1,5 +1,5 @@
 import { NodeIKernelProfileListener } from '../listeners';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelProfileService {
     addKernelProfileListener(listener: NodeIKernelProfileListener): void;
     removeKernelProfileListener(listenerId: unknown): void;
diff --git a/src/onebot11/index.ts b/src/index.ts
similarity index 71%
rename from src/onebot11/index.ts
rename to src/index.ts
index b04b9dd6..fb40028d 100644
--- a/src/onebot11/index.ts
+++ b/src/index.ts
@@ -1,7 +1,6 @@
 import { napCatCore } from '@/core';
-import { MsgListener } from '@/core/qqnt/listeners';
+import { MsgListener } from '@/core/listeners';
 import { NapCatOnebot11 } from '@/onebot11/main';
-import { ob11Config } from '@/onebot11/config';
 import { program } from 'commander';
 import qrcode from 'qrcode-terminal';
 import * as readline from 'node:readline';
@@ -36,47 +35,35 @@ checkVersion().then((remoteVersion: string) => {
   console.error('[NapCat] 检测更新失败');
 });
 new NapCatOnebot11();
-napCatCore.addLoginSuccessCallback(() => {
+napCatCore.onLoginSuccess(() => {
   console.log('login success');
   postLoginStatus();
-  const msgListener = new MsgListener();
-  msgListener.onRecvMsg = (msg) => {
-    // console.log(JSON.stringify(Array.from(msg[0].msgAttrs.values())));
-    // napCatCore.service.msg.kernelService?.getMsgsByMsgId(msg[0].msgId, 20).then(res=>console.log(res));
-
-    // console.log("onRecvMsg", msg)
-  };
-  // napCatCore.getGroupService().getGroupExtList(true).then((res) => {
-  //     console.log(res)
-  // })
-  napCatCore.service.msg.addMsgListener(msgListener);
 });
-napCatCore.on('system.login.qrcode', (qrCodeData: { url: string, base64: string }) => {
+const showQRCode = (qrCodeData: { url: string, base64: string, buffer: Buffer }) => {
   console.log('请扫描下面的二维码，然后在手Q上授权登录：');
   console.log('二维码解码URL:', qrCodeData.url);
   const qrcodePath = path.join(__dirname, 'qrcode.png');
-  fs.writeFile(qrcodePath, qrCodeData.base64.split('data:image/png;base64')[1], 'base64').then(() => {
+  fs.writeFile(qrcodePath, qrCodeData.buffer).then(() => {
     console.log('二维码已保存到', qrcodePath);
   });
   qrcode.generate(qrCodeData.url, { small: true }, (res) => {
     console.log(res);
   });
-});
-// console.log(cmdOptions);
+};
 const quickLoginQQ = cmdOptions.qq;
-napCatCore.on('system.login.error', (result) => {
-  console.error('登录失败', result);
-  napCatCore.login.qrcode().then().catch(console.error);
-});
+// napCatCore.on('system.login.error', (result) => {
+//   console.error('登录失败', result);
+//   napCatCore.qrLogin().then().catch(console.error);
+// });
 if (quickLoginQQ) {
   console.log('quick login', quickLoginQQ);
-  napCatCore.login.quick(quickLoginQQ).then().catch((e) => {
-    console.error(`${quickLoginQQ}快速登录不可用，请检查是否已经登录了`, e);
-    napCatCore.login.qrcode().then();
+  napCatCore.quickLogin(quickLoginQQ).then().catch((e) => {
+    console.error(e);
+    napCatCore.qrLogin().then(showQRCode);
   });
 } else {
   console.info('没有 -q 参数指定快速登录的QQ，将使用二维码登录方式');
-  napCatCore.login.qrcode().then();
+  napCatCore.qrLogin().then(showQRCode);
 }
 
 // napCatCore.login.service.getLoginList().then((res) => {
diff --git a/src/onebot11/action/extends/Debug.ts b/src/onebot11/action/extends/Debug.ts
index a23b6fc4..7bf1a225 100644
--- a/src/onebot11/action/extends/Debug.ts
+++ b/src/onebot11/action/extends/Debug.ts
@@ -8,9 +8,9 @@ import {
   NTQQFileApi,
   // NTQQFileCacheApi,
   NTQQWindowApi,
-} from '@/core/qqnt/apis';
+} from '@/core';
 import { ActionName } from '../types';
-import { log } from '../../../common/utils/log';
+import { log } from '@/common/utils/log';
 
 interface Payload {
   method: string,
diff --git a/src/onebot11/action/extends/GetGroupAddRequest.ts b/src/onebot11/action/extends/GetGroupAddRequest.ts
index e6e143a6..f6b5cc57 100644
--- a/src/onebot11/action/extends/GetGroupAddRequest.ts
+++ b/src/onebot11/action/extends/GetGroupAddRequest.ts
@@ -1,10 +1,9 @@
-import { GroupNotify, GroupNotifyStatus } from '../../../ntqqapi/types';
+import { GroupNotify, GroupNotifyStatus } from '@/core/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { uid2UinMap } from '../../../common/data';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
-import { log } from '../../../common/utils/log';
+import { uid2UinMap } from '@/common/data';
+import { NTQQUserApi } from '@/core/apis/user';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface OB11GroupRequestNotify {
   group_id: number,
diff --git a/src/onebot11/action/extends/SetQQAvatar.ts b/src/onebot11/action/extends/SetQQAvatar.ts
index 6ff17f48..fcb8746f 100644
--- a/src/onebot11/action/extends/SetQQAvatar.ts
+++ b/src/onebot11/action/extends/SetQQAvatar.ts
@@ -1,8 +1,8 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import * as fs from 'node:fs';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
-import { checkFileReceived, uri2local } from '../../../common/utils/file';
+import { NTQQUserApi } from '@/core/apis/user';
+import { checkFileReceived, uri2local } from '@/common/utils/file';
 // import { log } from "../../../common/utils";
 
 interface Payload {
@@ -40,4 +40,4 @@ export default class SetAvatar extends BaseAction<Payload, null> {
     } 
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/file/GetFile.ts b/src/onebot11/action/file/GetFile.ts
index 5ed6ab87..9283c1dd 100644
--- a/src/onebot11/action/file/GetFile.ts
+++ b/src/onebot11/action/file/GetFile.ts
@@ -6,8 +6,8 @@ import { log } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';
 import { uri2local } from '@/common/utils/file';
 import { ActionName } from '../types';
-import { FileElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
-import { NTQQFileApi } from '@/core/qqnt/apis';
+import { FileElement, RawMessage, VideoElement } from '@/core/entities';
+import { NTQQFileApi } from '@/core/apis';
 
 export interface GetFilePayload {
   file: string; // 文件名或者fileUuid
diff --git a/src/onebot11/action/go-cqhttp/GetForwardMsg.ts b/src/onebot11/action/go-cqhttp/GetForwardMsg.ts
index 23316aea..30017cea 100644
--- a/src/onebot11/action/go-cqhttp/GetForwardMsg.ts
+++ b/src/onebot11/action/go-cqhttp/GetForwardMsg.ts
@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types';
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '@/core/apis';
 import { dbUtil } from '@/common/utils/db';
 import { OB11Constructor } from '../../constructor';
 import { ActionName } from '../types';
diff --git a/src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts
index 45bc8930..e54656ee 100644
--- a/src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts
+++ b/src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts
@@ -2,9 +2,9 @@ import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { getFriend, friends, uid2UinMap, getUidByUin } from '@/common/data';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/qqnt/entities';
+import { ChatType } from '@/core/entities';
 import { dbUtil } from '@/common/utils/db';
-import { NTQQMsgApi } from '@/core/qqnt/apis/msg';
+import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 
 
diff --git a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
index 2a9c0245..81bca255 100644
--- a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
+++ b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
@@ -2,9 +2,9 @@ import BaseAction from '../BaseAction';
 import { OB11Message, OB11User } from '../../types';
 import { getGroup, groups } from '@/common/data';
 import { ActionName } from '../types';
-import { ChatType } from '@/core/qqnt/entities';
+import { ChatType } from '@/core/entities';
 import { dbUtil } from '@/common/utils/db';
-import { NTQQMsgApi } from '@/core/qqnt/apis/msg';
+import { NTQQMsgApi } from '@/core/apis/msg';
 import { OB11Constructor } from '../../constructor';
 
 
diff --git a/src/onebot11/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot11/action/go-cqhttp/GetStrangerInfo.ts
index 7f218a30..583cc50a 100644
--- a/src/onebot11/action/go-cqhttp/GetStrangerInfo.ts
+++ b/src/onebot11/action/go-cqhttp/GetStrangerInfo.ts
@@ -3,7 +3,7 @@ import { OB11User } from '../../types';
 import { getUidByUin, uid2UinMap } from '@/common/data';
 import { OB11Constructor } from '../../constructor';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
+import { NTQQUserApi } from '@/core/apis/user';
 import { log } from '@/common/utils/log';
 
 
diff --git a/src/onebot11/action/go-cqhttp/UploadGroupFile.ts b/src/onebot11/action/go-cqhttp/UploadGroupFile.ts
index e2fa46e0..5bc49b99 100644
--- a/src/onebot11/action/go-cqhttp/UploadGroupFile.ts
+++ b/src/onebot11/action/go-cqhttp/UploadGroupFile.ts
@@ -1,10 +1,10 @@
 import BaseAction from '../BaseAction';
 import { getGroup } from '@/common/data';
 import { ActionName } from '../types';
-import { SendMsgElementConstructor } from '@/core/qqnt/entities/constructor';
-import { ChatType, SendFileElement } from '@/core/qqnt/entities';
+import { SendMsgElementConstructor } from '@/core/entities/constructor';
+import { ChatType, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { NTQQMsgApi } from '@/core/qqnt/apis/msg';
+import { NTQQMsgApi } from '@/core/apis/msg';
 import { uri2local } from '@/common/utils/file';
 
 interface Payload {
diff --git a/src/onebot11/action/group/GetGroupList.ts b/src/onebot11/action/group/GetGroupList.ts
index 1faeb0f9..28fe806e 100644
--- a/src/onebot11/action/group/GetGroupList.ts
+++ b/src/onebot11/action/group/GetGroupList.ts
@@ -3,8 +3,8 @@ import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { groups } from '@/common/data';
-import { NTQQGroupApi } from '@/core/qqnt/apis';
-import { Group } from '@/core/qqnt/entities';
+import { NTQQGroupApi } from '@/core/apis';
+import { Group } from '@/core/entities';
 import { log } from '@/common/utils/log';
 
 interface Payload {
diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts
index 4bab508d..b115183e 100644
--- a/src/onebot11/action/group/GetGroupMemberInfo.ts
+++ b/src/onebot11/action/group/GetGroupMemberInfo.ts
@@ -1,10 +1,10 @@
 import { OB11GroupMember } from '../../types';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/qqnt/apis/user';
-import { log } from '../../../common/utils/log';
+import { NTQQUserApi } from '@/core/apis/user';
+import { log } from '@/common/utils/log';
 import { isNull } from '../../../common/utils/helper';
 
 
diff --git a/src/onebot11/action/group/SetGroupAddRequest.ts b/src/onebot11/action/group/SetGroupAddRequest.ts
index 95bc3787..202e019f 100644
--- a/src/onebot11/action/group/SetGroupAddRequest.ts
+++ b/src/onebot11/action/group/SetGroupAddRequest.ts
@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { GroupRequestOperateTypes } from '@/core/qqnt/entities';
+import { GroupRequestOperateTypes } from '@/core/entities';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 import { groupNotifies } from '@/common/data';
 
 interface Payload {
diff --git a/src/onebot11/action/group/SetGroupAdmin.ts b/src/onebot11/action/group/SetGroupAdmin.ts
index c229d9dc..466cf5f2 100644
--- a/src/onebot11/action/group/SetGroupAdmin.ts
+++ b/src/onebot11/action/group/SetGroupAdmin.ts
@@ -1,8 +1,8 @@
 import BaseAction from '../BaseAction';
 import { getGroupMember } from '@/common/data';
-import { GroupMemberRole } from '@/core/qqnt/entities';
+import { GroupMemberRole } from '@/core/entities';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
   group_id: number,
diff --git a/src/onebot11/action/group/SetGroupBan.ts b/src/onebot11/action/group/SetGroupBan.ts
index a162ecb2..49b9a0e7 100644
--- a/src/onebot11/action/group/SetGroupBan.ts
+++ b/src/onebot11/action/group/SetGroupBan.ts
@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -21,4 +21,4 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
       [{ uid: member.uid, timeStamp: parseInt(payload.duration.toString()) }]);
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/group/SetGroupCard.ts b/src/onebot11/action/group/SetGroupCard.ts
index d47941ff..10a907f2 100644
--- a/src/onebot11/action/group/SetGroupCard.ts
+++ b/src/onebot11/action/group/SetGroupCard.ts
@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -20,4 +20,4 @@ export default class SetGroupCard extends BaseAction<Payload, null> {
     await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '');
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/group/SetGroupKick.ts b/src/onebot11/action/group/SetGroupKick.ts
index 8668e2f9..31814967 100644
--- a/src/onebot11/action/group/SetGroupKick.ts
+++ b/src/onebot11/action/group/SetGroupKick.ts
@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '../../../common/data';
+import { getGroupMember } from '@/common/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
   group_id: number,
diff --git a/src/onebot11/action/group/SetGroupLeave.ts b/src/onebot11/action/group/SetGroupLeave.ts
index e78bc650..ee455d0a 100644
--- a/src/onebot11/action/group/SetGroupLeave.ts
+++ b/src/onebot11/action/group/SetGroupLeave.ts
@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
-import { log } from '../../../common/utils/log';
+import { NTQQGroupApi } from '@/core/apis/group';
+import { log } from '@/common/utils/log';
 
 interface Payload {
     group_id: number,
@@ -19,4 +19,4 @@ export default class SetGroupLeave extends BaseAction<Payload, any> {
       throw e;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/group/SetGroupName.ts b/src/onebot11/action/group/SetGroupName.ts
index ff51006a..77630edf 100644
--- a/src/onebot11/action/group/SetGroupName.ts
+++ b/src/onebot11/action/group/SetGroupName.ts
@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -15,4 +15,4 @@ export default class SetGroupName extends BaseAction<Payload, null> {
     await NTQQGroupApi.setGroupName(payload.group_id.toString(), payload.group_name);
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/group/SetGroupWholeBan.ts b/src/onebot11/action/group/SetGroupWholeBan.ts
index 5264becc..25ea1ae2 100644
--- a/src/onebot11/action/group/SetGroupWholeBan.ts
+++ b/src/onebot11/action/group/SetGroupWholeBan.ts
@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/qqnt/apis/group';
+import { NTQQGroupApi } from '@/core/apis/group';
 
 interface Payload {
     group_id: number,
@@ -15,4 +15,4 @@ export default class SetGroupWholeBan extends BaseAction<Payload, null> {
     await NTQQGroupApi.banGroup(payload.group_id.toString(), enable);
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/msg/DeleteMsg.ts b/src/onebot11/action/msg/DeleteMsg.ts
index 580827d1..80c9e9aa 100644
--- a/src/onebot11/action/msg/DeleteMsg.ts
+++ b/src/onebot11/action/msg/DeleteMsg.ts
@@ -1,4 +1,4 @@
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '@/core/apis';
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { dbUtil } from '@/common/utils/db';
diff --git a/src/onebot11/action/msg/MarkMsgAsRead.ts b/src/onebot11/action/msg/MarkMsgAsRead.ts
index 7eb82458..ea16b689 100644
--- a/src/onebot11/action/msg/MarkMsgAsRead.ts
+++ b/src/onebot11/action/msg/MarkMsgAsRead.ts
@@ -1,7 +1,7 @@
-import { ChatType, Peer } from '@/core/qqnt/entities';
+import { ChatType, Peer } from '@/core/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '@/core/apis';
 import { getFriend, getUidByUin } from '@/common/data';
 
 interface Payload {
diff --git a/src/onebot11/action/msg/SendMsg.ts b/src/onebot11/action/msg/SendMsg.ts
index 06f51402..72a22e20 100644
--- a/src/onebot11/action/msg/SendMsg.ts
+++ b/src/onebot11/action/msg/SendMsg.ts
@@ -7,7 +7,7 @@ import {
   SendArkElement,
   SendMessageElement,
   Peer
-} from '@/core/qqnt/entities';
+} from '@/core/entities';
 
 import {
   OB11MessageCustomMusic,
@@ -17,7 +17,7 @@ import {
   OB11MessageNode,
   OB11PostSendMsg
 } from '../../types';
-import { SendMsgElementConstructor } from '@/core/qqnt/entities/constructor';
+import { SendMsgElementConstructor } from '@/core/entities/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
@@ -27,8 +27,8 @@ import { log } from '@/common/utils/log';
 import { sleep } from '@/common/utils/helper';
 import { uri2local } from '@/common/utils/file';
 import { getFriend, getGroup, getGroupMember, getUidByUin, selfInfo } from '@/common/data';
-import { NTQQMsgApi } from '@/core/qqnt/apis';
-import { NTQQFileApi } from '@/core/qqnt/apis';
+import { NTQQMsgApi } from '../../../core/src/apis';
+import { NTQQFileApi } from '../../../core/src/apis';
 
 const ALLOW_SEND_TEMP_MSG = false;
 
diff --git a/src/onebot11/action/system/CleanCache.ts b/src/onebot11/action/system/CleanCache.ts
index 4a03496e..f15aa63c 100644
--- a/src/onebot11/action/system/CleanCache.ts
+++ b/src/onebot11/action/system/CleanCache.ts
@@ -6,9 +6,9 @@ import {
   ChatType,
   ChatCacheListItemBasic,
   CacheFileType
-} from '../../../ntqqapi/types';
+} from '@/core/entities';
 import { dbUtil } from '../../../common/db';
-import { NTQQFileApi, NTQQFileCacheApi } from '@/core/qqnt/apis/file';
+import { NTQQFileApi, NTQQFileCacheApi } from '@/core/apis/file';
 
 export default class CleanCache extends BaseAction<void, void> {
   actionName = ActionName.CleanCache;
@@ -102,4 +102,4 @@ function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为
       })
       .catch(e => rej(e));
   });
-}
\ No newline at end of file
+}
diff --git a/src/onebot11/action/system/GetStatus.ts b/src/onebot11/action/system/GetStatus.ts
index 8007ddb9..25d687e9 100644
--- a/src/onebot11/action/system/GetStatus.ts
+++ b/src/onebot11/action/system/GetStatus.ts
@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { OB11Status } from '../../types';
 import { ActionName } from '../types';
-import { selfInfo } from '../../../common/data';
+import { selfInfo } from '@/common/data';
 
 
 export default class GetStatus extends BaseAction<any, OB11Status> {
diff --git a/src/onebot11/action/user/SendLike.ts b/src/onebot11/action/user/SendLike.ts
index 801993ce..fd1bf3af 100644
--- a/src/onebot11/action/user/SendLike.ts
+++ b/src/onebot11/action/user/SendLike.ts
@@ -1,4 +1,4 @@
-import { NTQQUserApi } from '@/core/qqnt/apis';
+import { NTQQUserApi } from '../../../core/src/apis';
 import BaseAction from '../BaseAction';
 import { getFriend, getUidByUin, uid2UinMap } from '../../../common/data';
 import { ActionName } from '../types';
diff --git a/src/onebot11/action/user/SetFriendAddRequest.ts b/src/onebot11/action/user/SetFriendAddRequest.ts
index b2f9de02..b96983ae 100644
--- a/src/onebot11/action/user/SetFriendAddRequest.ts
+++ b/src/onebot11/action/user/SetFriendAddRequest.ts
@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQFriendApi } from '@/core/qqnt/apis/friend';
+import { NTQQFriendApi } from '@/core/apis/friend';
 import { friendRequests } from '@/common/data';
 
 interface Payload {
diff --git a/src/onebot11/config.ts b/src/onebot11/config.ts
index 0ba3457e..301405ae 100644
--- a/src/onebot11/config.ts
+++ b/src/onebot11/config.ts
@@ -66,7 +66,7 @@ class Config implements OB11Config {
       console.log('get config', jsonData);
       Object.assign(this, jsonData);
       // eslint-disable-next-line
-    } catch (e) {
+    } catch (e: any) {
       if (e instanceof SyntaxError) {
         console.error(`配置文件 ${ob11ConfigPath} 格式错误，请检查配置文件:`, e.message);
       }else{
diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts
index b4119fb0..34fa3ced 100644
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@@ -22,7 +22,7 @@ import {
   Sex,
   TipGroupElementType,
   User
-} from '@/core/qqnt/entities';
+} from '../core/src/entities';
 import { EventType } from './event/OB11BaseEvent';
 import { encodeCQCode } from './cqcode';
 import { dbUtil } from '@/common/utils/db';
@@ -40,7 +40,7 @@ import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent';
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent';
 import { ob11Config } from '@/onebot11/config';
 import { deleteGroup, getFriend, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/common/data';
-import { NTQQFileApi, NTQQGroupApi, NTQQUserApi } from '@/core/qqnt/apis';
+import { NTQQFileApi, NTQQGroupApi, NTQQUserApi } from '../core/src/apis';
 import http from 'http';
 
 
diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts
index cc01124a..5c0713ca 100644
--- a/src/onebot11/main.ts
+++ b/src/onebot11/main.ts
@@ -1,5 +1,5 @@
 import { napCatCore } from '@/core';
-import { MsgListener } from '@/core/qqnt/listeners';
+import { MsgListener } from '../core/src/listeners';
 import { OB11Constructor } from '@/onebot11/constructor';
 import { postOB11Event } from '@/onebot11/server/postOB11Event';
 import {
@@ -10,16 +10,16 @@ import {
   GroupNotify,
   GroupNotifyTypes,
   RawMessage
-} from '@/core/qqnt/entities';
+} from '../core/src/entities';
 import { ob11Config } from '@/onebot11/config';
 import { httpHeart, ob11HTTPServer } from '@/onebot11/server/http';
 import { ob11WebsocketServer } from '@/onebot11/server/ws/WebsocketServer';
 import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket';
 import { friendRequests, getFriend, getGroup, getGroupMember, groupNotifies, selfInfo } from '@/common/data';
 import { dbUtil } from '@/common/utils/db';
-import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '@/core/qqnt/listeners';
+import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '../core/src/listeners';
 import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest';
-import { NTQQGroupApi, NTQQUserApi } from '@/core/qqnt/apis';
+import { NTQQGroupApi, NTQQUserApi } from '../core/src/apis';
 import { log } from '@/common/utils/log';
 import { OB11GroupRequestEvent } from '@/onebot11/event/request/OB11GroupRequest';
 import { OB11GroupAdminNoticeEvent } from '@/onebot11/event/notice/OB11GroupAdminNoticeEvent';
@@ -156,7 +156,7 @@ export class NapCatOnebot11 {
       }).catch(e => log('constructGroupEvent error: ', e));
       OB11Constructor.FriendAddEvent(message).then(friendAddEvent=>{
         if(friendAddEvent){
-          postOB11Event(friendAddEvent)
+          postOB11Event(friendAddEvent);
         }
       }).catch(e => log('constructFriendAddEvent error: ', e));
     }
diff --git a/src/onebot11/server/postOB11Event.ts b/src/onebot11/server/postOB11Event.ts
index 8fb8219a..f7170cfd 100644
--- a/src/onebot11/server/postOB11Event.ts
+++ b/src/onebot11/server/postOB11Event.ts
@@ -6,14 +6,14 @@ import { wsReply } from './ws/reply';
 import { log } from '@/common/utils/log';
 import { ob11Config } from '@/onebot11/config';
 import crypto from 'crypto';
-import { ChatType, Group, GroupRequestOperateTypes, Peer } from '@/core/qqnt/entities';
+import { ChatType, Group, GroupRequestOperateTypes, Peer } from '../../core/src/entities';
 import { convertMessage2List, createSendElements, sendMsg } from '../action/msg/SendMsg';
 import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest';
 import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
 import { isNull } from '@/common/utils/helper';
 import { dbUtil } from '@/common/utils/db';
 import { friendRequests, getGroup, groupNotifies, selfInfo } from '@/common/data';
-import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi } from '@/core/qqnt/apis';
+import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi } from '../../core/src/apis';
 
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
 
diff --git a/src/onebot11/types.ts b/src/onebot11/types.ts
index e11d9512..434c9246 100644
--- a/src/onebot11/types.ts
+++ b/src/onebot11/types.ts
@@ -1,4 +1,4 @@
-import { PicSubType, RawMessage } from '@/core/qqnt/entities';
+import { PicSubType, RawMessage } from '@/core';
 import { EventType } from './event/OB11BaseEvent';
 
 export interface OB11User {
diff --git a/tsconfig.json b/tsconfig.json
index 20ce13aa..a265da33 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,10 +28,6 @@
         "./src/core/src/index",
         "./src/core.lib/src/index"
       ],
-      "@/core/qqnt/*": [
-        "./src/core/src/qqnt/*",
-        "./src/core.lib/src/qqnt/*"
-      ],
       "@/core/*": [
         "./src/core/src/*",
         "./src/core.lib/src/*"