From 45dedb4872570d7e773e4ca8a1762e9019c6ba2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sun, 15 Sep 2024 09:35:10 +0800
Subject: [PATCH 1/8] fix: 28060

---
 src/common/helper.ts        |  6 +++---
 src/common/qq-basic-info.ts | 28 +++++++++++++++-------------
 src/core/index.ts           |  5 +++--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/common/helper.ts b/src/common/helper.ts
index c758c3a9..198c44da 100644
--- a/src/common/helper.ts
+++ b/src/common/helper.ts
@@ -179,18 +179,18 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     };
 }
 
-export function getQQPackageInfoPath(exePath: string = ''): string {
+export function getQQPackageInfoPath(exePath: string = '', version: string): string {
     if (os.platform() === 'darwin') {
         return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
     } else {
-        return path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
+        return path.join(path.dirname(exePath), './versions/9.9.15-28060/resources/app/package.json');
     }
 }
 
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
     let configVersionInfoPath;
     if (os.platform() === 'win32') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
     } else if (os.platform() === 'darwin') {
         const userPath = os.homedir();
         const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
diff --git a/src/common/qq-basic-info.ts b/src/common/qq-basic-info.ts
index 4184902b..91570676 100644
--- a/src/common/qq-basic-info.ts
+++ b/src/common/qq-basic-info.ts
@@ -19,14 +19,16 @@ export class QQBasicInfoWrapper {
         //基础目录获取
         this.context = context;
         this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath);
         this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
+
         //基础信息获取 无快更则启用默认模板填充
         this.isQuickUpdate = !!this.QQVersionConfigPath;
         this.QQVersionConfig = this.isQuickUpdate
             ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
             : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion!);
         this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
         const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
         this.QQVersionAppid = IQQVersionAppid;
@@ -53,23 +55,23 @@ export class QQBasicInfoWrapper {
     //此方法不要直接使用
     getQUAInternal() {
         switch (systemPlatform) {
-        case 'linux':
-            return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-        case 'darwin':
-            return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;                
-        default:
-            return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+            case 'linux':
+                return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+            case 'darwin':
+                return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+            default:
+                return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
         }
     }
 
     getAppidInternal() {
         switch (systemPlatform) {
-        case 'linux':
-            return '537243600';
-        case 'darwin':
-            return '537243441';
-        default:
-            return '537243538';
+            case 'linux':
+                return '537243600';
+            case 'darwin':
+                return '537243441';
+            default:
+                return '537243538';
         }
     }
 
diff --git a/src/core/index.ts b/src/core/index.ts
index cf6667b2..6f9791eb 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -46,14 +46,15 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
     if (os.platform() === 'darwin') {
         appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
     } else {
-        appPath = path.resolve(path.dirname(process.execPath), './resources/app');
+        appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
     }
     let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
     if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(appPath, `versions/${QQVersion}/wrapper.node`);
+        wrapperNodePath = path.join(appPath, `./resources/app./wrapper.node`);
     }
     const nativemodule: any = { exports: {} };
     process.dlopen(nativemodule, wrapperNodePath);
+    //\versions\9.9.15-28060\resources\app\wrapper.node
     return nativemodule.exports;
 }
 

From 16f7bb48f2bbdec744dabe36e8b2738a2ad4d344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sun, 15 Sep 2024 14:34:47 +0800
Subject: [PATCH 2/8] fix: launcher 28060

---
 launcher/NapCatWinBootHook.dll | Bin 11264 -> 18944 bytes
 launcher/NapCatWinBootMain.exe | Bin 22528 -> 22528 bytes
 launcher/launcher-win10.bat    |   2 +-
 launcher/launcher.bat          |   2 +-
 launcher/patchNapCat.js        |   1 -
 launcher/qqnt.json             |  23 +++++++++++++++++++++++
 6 files changed, 25 insertions(+), 3 deletions(-)
 delete mode 100644 launcher/patchNapCat.js
 create mode 100644 launcher/qqnt.json

diff --git a/launcher/NapCatWinBootHook.dll b/launcher/NapCatWinBootHook.dll
index cd6ff3464883df9f8117133e1dc1c4a1ec8b7c3c..0ad9943f96946c5feeecb44b628a4b276c7ea4cb 100644
GIT binary patch
literal 18944
zcmeHv4R}=5wf3H5CJZ5ACdz2=cfg53BQa!B8x4V(B!hcoMgt^36-Z(-fz)IsPR>B^
z+Dqt=UWRk0reE#fz3naHPxXG*Vs9S}_Qwf{NkGtmej3!asr~U_e7sRng0?;1yY@Mg
z3;}v?pYOTP_t*2V&)R$Kwbx#I?X}lld!GsZJ9}6<W6X%8s*Lpl(&G~Ezx<j+_1vqU
zo6CMO`{;sRgYW2qnk_9I_V#dSbGV_+-q;Wfh9vvl0ed(Sw6_H9Rd=khw}qMlh1uDe
z4xM%M@lxZ^p|$Ih>7}P%Sa%d<6JN9TH33(zeObWTwfzFFTiXZtk58{#dk}Ew(7JUy
z0ZUe{S^I*3Pplghux2g6)h&%%i1*BqRC^d}`bq|i?f64;vTlMcw9iSKo6i;kQ>bAV
zT?c3t`7Q$i%BL}wAyCth?FE9Ah$o%ZgH&sj1m~8gFrv*{)r|dwa$Ss#QAh2J_0Ys5
zpB~26BfozIV^<_`=Yj1QmrDq$SGpLRNG;E3Qz!*GCE(s$fES5OW7o%loOtYv)fa}F
z8l(o;M=nq<q|1=5MM`;Gs43LQ*jOei>XD!;K@X68T#O|O+ciQlMvPVTS&^jBAn06$
z;f`=4ib5w{$Php1AoXzxx<G3Pgrp+|T?sl)h3Ut|*o+>g>;8Yu@#uSto+F*|cy?C}
zW6Iyb2#_CuJ@DwjqLa_gW9-QEL-eSQ6vJKEE?okmnCaVSN3{JQ)9dp@{pli6Z%?g{
zZE#q5tksdrWA{7k?zL!O=g+I!v%@Qoa`|1K{DH4*$np=zNv`N;mTi~w*cYsP$en8e
zMwz?{6FF#fvXlQz1ad!*Nsb~O9k%eYp{>{PUSR3z;?YDtmxq;gG^Xx^^f?}H&*#xU
zjPclt$?@d}E&&mjCwW;Pw^W?r@jDEB=NVcB;fr|Ooe%uh_2a)#Z4Y1^M|k%kDO1TJ
zR`SGnn)4H%-0zLu#O43tjcu}W`6X}c?{k$6kZsU-6=+B#d4r>r%dHL<m+yCQ=*aHg
z)UR}AgPpRP-bZ-M=P<8XyUtzXu63_<uOoH%WyL3d%Ao{#wom@hU+@8!-DYn=AOC4m
zPrR((vJ38-`Qr5kE_<!sf<s(B#*e*A>L@tK%Z9h+bLe^tKcKJDE~OgUBQ@O2<DF2$
zJ5a-|ljF5KZp`$`Z+XiGxTSKG@BB<?;Bp>csdFfM(ejn=ps(?ttF~P?3RS!*UCQMb
zl|Rqb6d0>=bc)`_vz)5dEoQgVmwwu9dB(%syEA<93Nx24;quG=vdM_aS8#BAzF!^!
zRQy*m=8fNOAQFGUkXL?Pxdo^mpZua<9^mrp(5>>|91zKaLWOniP412E4RxFD>Q{VO
zq{|F?i-$V5uT5&wC*NyLQJUQEu{?9eTQCUS^0I@LFW&&qNXCfyX%Pm=eX%A-wLk8-
z#4EqbqlaNpuWY-8%STDA$4+w0L7B4cI;iYAF2BLcMqoIjJYH$w<w9$)Fb=yJwtVGv
zQrKL60DvCYVqd=U66Ty{;J&kFU>>2e$xxr7dU+DorTSvcRzC(D+ms8X@#vo{TUT=V
zDlWgGOkNJEc&)*+d+9RwVAV1M<2yeU-Gg-HB#$1<=LIJq6|$38Zv*EOG+A*lAD^$<
z`WDj^%C9N=!6$`BY#B#?!cfU%eKIsb7Q8;GbeQhX;nt5R-=eqnxYmdTOg$WgUx;Jd
zw5&_;_!={h&4Dt^mYg(YjS$$h7nMAgPO8L8xQpDyks0m%=WTzn*1q#R?RngEFQJFr
zSeV4#Z3gOgL5YRYCpyt(Jx_nXgf7mN_hD>qXGuBDASv%EsQLtternlz1D9uW_2ASL
z_++=30&l@EoQO6B3%r=zY#1pYs?_8hsuaF#Fr7RnbfMa=zk!sR<PUw$CXWN#TVv$~
z$NnPw%ZdF{SRu{?={Hsh<yTshjE@ye%@+Jk+;kEh@t6SyX+HV<{FFKxC9NN`@Is(`
zo+#xrAcn1jT<HP%C;bK~`#A~&V3$fMdL<))uN$Hc>t-n2Rh#PE;;oJ|eCK=Qpt)>H
zcmbRPJmxv=m(O_Q3Hd|xRwV~QRdU-lE_-&M>PN7ucl_}B@6TqeJ7MX*717Dg@+)qq
zcvanD*|iYmnCAhIjY3@2b{ir#tR)_|^@?(ZD3AK${s*4RLdR9{iW1bTw)v>Q!n1v7
zv6^acW9&mqPP%MbgB%n{<W;gqYl79I+TL9RzHwVr=;UQ(J2c=tgq3UgMxQfLYPuTj
zEDt8S`z*T}v7bVm7Sa7rsTp=P5bnAS6@#WzUd9YCI!lh{^#l7Mk@D<pIC2?t=Xt%^
z5;AqdC_l37@Vo;iOTolqHCS@+_F64D+-kA9?Uo#u9pxgFi%@o<>_WL3<!Y4cQLg9l
zo-Qy)vE7nWF=4UBL@_7RV%^z86*(2ywRY}Bmd7gW^3KPRi&ZSLJhSsj<aSrw;2!My
zA#%{^Yx#`1573<Z;-2T>gUDIkY!(x;>lDy%N3Zj^|69t>FvKdkc8JRxpZBG|;*<T~
z@|L|}iSD4bvgi9=Y*GcU_zU_ZJ62e8kL8)Hw5~HpBx9*LvWBY(nz@1(y=BAU-}_<y
zJGfl?18>1GuiTeh0XFh)e%U)o8)7t}EwE~@d`Ni`0?`Wad<*IONIw{_=W0J!4?~1-
z5AlNwoypIB9)4TrsJ4H?#2s-a#;+vStIlPehOXpMSe~#f3ZY<G%dl(asJ35V&$T>j
z`Vj)v=2&IUlra&NM)6%x^gx(@7e1tf9Ej}4PB%5oD})=zFlo=xhq-l@YD*`vl)hPD
z6fJ)NM#rSfV3q^d1A+DUwhgd5!7ZNhCr}BRGgCC9I?XSpX?{sGG8P$j@S-a0go~=M
z0U`o<*&`3iuYsd#JDEo`lQ70@STV^mEwFW>{2Ng}I^=l(!oWaguCu36k9Bqp)>%5%
znCT?6BCj;ZvK3_DWlnsiB4#j2IJwYL{Gx!g6t^IE-lbRvju2-A3rYE<iKK(Q`A>7_
z5yh8*;?4o`Fz)F%VPpT0>0MC&86M*RD46mjnjJZS7gHXhZ1N%hhe$wj*lQ^!qlip?
z4=$?<lw3AtdjN#XniP)Fzu)8hT~#db2#kMJv0#3Ce6f6AY_l23>V6*a1*?jE=@GYl
z3Tjq_7gz;kv*qetsDhOUKhW!o1%{DEc-f%k%X=v*DHwG3lDT-x5<W{s0t;-EN53>-
z;g(yGOMeX=_9{=EQdM{KWg~UL<DOnnj1Yy$4W~txb(JoU%<1YhERUGn^1!(1@<epl
z(4C0n4SMz>23Tk2W$Ucc?7_4nT)ovielM2yUNWP=$ErHssM>y>N6U7C$2U&#-q>3e
zv%7m~8-q}f3*Y!>2MT2yAGho}4YWJDY@ub>7;?Lbo8F0ecbe!UJK2W;eb5pZ5ldjP
zwgh@pmVj942yRoCz_vS-7mVmEI+!LDS~g+%axbP8d?o~+GL6q@3ZHAvx0L3pwq8ix
zquQP(poEC4u%k(`BO{8w_;(#$7=>59%jK0jxL5wIu&E7o8~c@yFiAZyLg%$GAy+y~
z2!**+$frW`A$v-mcVJW^+^6jo`{fyD0;|q0EWm)kW$J*l+b{$?nGTl^^XPrKmaT}L
zGktR3c)AZ^7J^s#i&k&C!pn|I8!gXlaJZ)Ismk)qTzA(QyHw8QJK*2f<?^z_9akd~
zK^M0Ifn6Fw3xcp&RlBpygH>h&8_z+j{^zs~UsevlsJJ@F%RY`gEi|$LM;And)pVv=
zk4?TPWs?{20)@~Rq~yreA_w_|mt>snl@*SI4E*lm|4bNDL}AQ3FnWa7H}Y5+by_N-
znYi)u)VWK9H6q#&p@wSvcwvgJN#{^4=W(CIuDlKNf{$|28C4)oz+{u>(^|~AvI`?l
z&QlVi{US`{?_u{!(}nAQNcFc}s9rwk-8q>I$ZwnU(lK<}i*LIKw&|5eXse?W_QznO
z+6uIhaCwy(KC$*1NZoxLZv5cc0Tsy?{nTLT{vMe}Jo|S<NM|0^w#tsI2z;IgQnh(e
z77-7usT9<(XCEC$hp}x@5QOtPC{jK19d3B$N^{I~J2H@B`6t3Nzp-5N%p-t;2SrMP
zvuqjw4lV$0x=Kbjs;&QOLO`Hi3=8X2yB0{Qm*UTRs~GE7^Y(yH&AS33sCie3w_Us!
zinl|&uNCj2DLlo;9yu3BFL(5}lRo*7`x9pL$;YIN-LlK<Z>%<+9`&Uk<Bh|<YmRvv
z`)`xy!Q?BgGRFd{G=EZMNViCHEYAQ&$0mH~!#?L>Z0~oS#EzJ13e8jNiI-*1#}Fe{
z-q&YsKHaCP5ko)kJ7hh%2_ZpBygqKBGuC(J3XNV&`L81nhcCTDaq(R^^L(aC8Oj5*
z(M+lRld2v$`7q^$%`Q^bAdm*}f&iC|c|{P1L+Ei6&XUqRXJUd|p3df#5aj*hgiz{!
z!}#fB+e@{!vy?l*aD2X^W?~+Pm8&#ijKzuZS<0m->_^a#`5+r|9#R%#f_5Q%)%YcO
z<%4clB0`NWQZCa9vy>cU#@|b6uc+Br0iWWfBdI-|9cK6fuYAUf!2S&`pH$i*7WSS?
zqMsQeIX-#Nd7R5QSP!YTt-@$(9P4GDcIGV7*1lNtwA4@f&=bk66bL4g6}HbSGy^;7
zCt1RHfxAgrDM+WsS*w?)cyu3%%o;Qq(AuCZ!YnFIQ0QZxr(CNQW<x`lBRl@?)Bv@!
zSy%ZmRtJ+$L^emy7`A;;`3{thnOoHTX2b!hevDe>M_ED`lJYq!e_xcPLTJ@VA^xKa
zNc3S9VZLc62oV450iYs56u%BIXxfOkK?nc~(!!Nx!f2q2Tx<xv{yPy&+-&;XTQJN{
z-k7}w8F;-s0_lf$-c0x0k-FYFX+-AEjnv@A#q#W`dDs$jdHONSv+fKY&+78Uvkvpv
zJcqaJn3OBumgOt!3unp|=JY;aSt4u(^`h}#W4^kN3(J@nz0bkEL^hHMJInw~6K0v)
zujy#d2_*`}I*&syb9TKMnZ^IXw#OxA3*$)YaR)GL&k4!6>v$wfoL~36sQdu7oE$K0
zN<R-r%kKm+cKH*LSxOT~Xt})t?N$M;+zJHs#Vu7hnH<#Co4&5-%8Z{Ly*zPxR2BZV
zA8`-Poa<q!Td--hBiifK?;*YN7vLX1^dsPrPtr*RmwNIUU%b+&>_U(#dyJ0ePez4f
z^IV>ApB}ABPgHeR8YNis%XC>o5%W=HD@;^B6VnDJj5y`~52Kp-r1+cYdsZJN!bfY#
z?|jo2uW{u13P${vidO<Y`HDP>yZmLZbX?Nx-uX70@W=m|O&|!wMFOyq37?F%aKD(c
z0V}o+U4L=YO0mRF;4J^iL4%Yj4)Dr-6nalx$I$xfJ}%uHeb*o@qSqzZX{5|)N3Nv(
z5n-W8c?HcZ&uD&wHZt19aJR_(;xsIZxdyUg;SVH=4ep=1>y<ym^)41y7`)(qb`7JU
za^_Q2-7~to%HeW7YlxQDE(6li{Q}-YCJzeW#*`{_yDK5xq5K^!+CqBy@q)R3Ra_8d
z?*LHNi{%)(PWcUZg4~Y!O<MiuslFKXL#Byx{nJFT3Zq*AckJ4wMwTnN#1O~zXepB%
z*ejK<3o#`uwn1@E?v-ESGQzOzgSaGetH)H+2Vf<1gloHmKJOCE`}CFX0UXy5Z<r7=
zV(NunL=foOb4E5jjrQG%9obrA7u1IUOC83&Ix3W3pV2jAkCrbZp(9S^BaBR02A;|f
z@rveM3p~Rxc0g9=ao3)gmG2;Dd1h4TRqh{uOcNlT1nAN2-|maKa%0t)8*aw^GhM_Z
z%AJru#q?mATW+@Hg6)o3&cw<0!9HH0Mkfv1JU9fIuY``^YBLd76w%C#&r@yxhN~eQ
zhk>D+jvoUHjmfV=UCJZS?sV0+QmYo9PF6)#L*ynfEfyOCHOoOA@BRe$E6QOJ;hP@7
zmoM5;=O$@X+fsDftxBe-njUdY^;n$JqlBAUQ?1rAGCRKB0IMt-pO>UnZD(+=p@}!1
z;e3;7u_Ca9Ix!P2_oli{6oF0KvIud#@+9qPA7FuC$2m=h1$l_BMPMA_GK>sBY+MgO
zbhOvkp?t!5NVWYtK0F{oP;KucquM$}arn8}Mn-GOeiv8s1_(#r1~4t92QG!qRNLdg
zVf3>Oz?rk7xP;EWYAI~s36wYmU)VKFm@*!xd^7<EXZi*RF#Puk#7uQ%8l?;QMxcgF
zHv>c64w;<D(OeFh%Jp0?mICAVB)~BHbJTLkXrP{_@pAT`J_mfvXS64gxO2^3bd!!m
z!{1?*C@M`~bf8rDqqU?!7d*LYn<WPRZ<Ao^R6VeNIJ<i2P__MDyQ09Sif9vpR|?>_
za2d5egs)Ib5vGrj?NmT8L(_v0_%Sq7hoWlQ{ZG^6(H8=myJ&+IEKFPIT35Ruwqefc
z4pdwaLmvIiaGW-axb1;F)QU61qnOzvC+A?@=r(}mq91dt&V=)jWnY!t=W)JSB_DV1
zoCr#RR`<>iTY>>^mHeVS;XLHVrvcBL5z9XJ&JS)41S2t{!!zd?gf+@%Xm(>Yj;zRC
zJeqwm6shJ-ELSaj$n;qWG}6Ubc_PEWq($ZR8EH&fP~J}9GSmJuf5cL>Z*%Yi222@E
z8n-;$*D<e3HvJO5(v2g2Rm^l8+3{Jx9YUs;98gu9e^xee|FtAG1gVnA*o{dsEYJOR
zc1NaXP9NHS6HSIptq_B_SH-ehkhMJb&OA%>YZ{^kh@a9;O6*F%R(E;Fc2Hc=(E;{`
z5#IN<ozEHJ7@(bu)4s6(mj1{(*>p9iqr>JQ(_CcIiGe8#Irk_1cBwQvY#%ax>|_iI
zN5x0T^@3`o>YCB2ve5_ve{gb)Egg$wN3&l=tt)orVE|fmi^zY9?|=i=x_;r1G5OBK
z&8A^cAk6KL=Jk=I#OFfnOZe>dq{Bt~-_G|E=uSSNud<4Z#VRw(FCM+_012oJz$y^?
z#QhWQ-Vqpt@(`8*6;+!D#9aQK0x}-|#waSWu3^cl?Ha1VYF(PN;P{xR6-3ik+|T22
zg(}F7i6>?3<Rsp>h?sQ`QzdM%n#a1S8xlky-M!zYUd1}^-c535l302RIO2M^=V~kn
z7hny|qiWj(p7JP`3tR*kV!Oqy5xT5$aMkt&>JUA-RNGo);fu2osY~WKPgnYc1OBdK
z1e(J28YygJ|3Rz@(q(Qf-I0kq4byvc-2Q3tzF#l?P62Xd{Sk>r1GN17R@{r`04IB_
zJm!J&dQrly_Y%tgM9athxmx*2DtmH;M*7C=+=;vsqB{Hd0Za!TaJmKs=X6&H|N7wB
zT9!~J8!*7rBPjk86|tvogsQWTk{?s^z6tK|3-RoqqkQsLq{q0a4|#DmQr3My{>to7
z{(ydvNke;l-3HC0f`;rzYy&)gWjbw!@$x@jfz^hCeLBr~hH86+lo{>E{o1d?C$&9+
zwgb)fl5Jl{BeWfv(RRxP+QJ1LQS&MwyP9`{co&LywRjhccT)<!NaSx3@1^3sRlK{z
z`?z?&D&C|IHLp{=e=Ob)iuYH<dy9B~QM~_Ayl=w$$dUbqeylI@urr_Ocvc;oSx4oR
z`n>xDuOt;Y3~Mcn$u52e;DOh#?ZoA7y|V9pT7?K4b1*3sMu~^V_mJ(MZ2FzpW-&*5
z)>FAgFT0YwWRD{{hO190I~s8O861n09?)QB?Hf~ufcB--e%`t5?NjaT)ZV2`{5IJh
zy~z0TZg3vjS&F5Rusql&_krzH?|b|%(bLJdK7^bpXuEP4m>yk>sS1s_40fmy<2+3K
zWvm?d3395wc(xB0b@-;zF4sa!(9r!j2oNWjdQv@P<4+W0JpT&qVO-}tU28PdgF1Xl
zhd<NdOFDd8hr3C;c)~i|pu-9s7V7XK9sYTpMn9&*0Uhqw;Wu^oWgYI*+i9&3?$&6z
zMLN7qhpjrK->lF>zd@nr$2xpOhZ>f#clGiq9ggYn+FFfbwGKDvFiVHcI{bSbCiyL$
zQD$qCH5xoMqdrrwpU~kYGw6eQ`G^i*)1gm?ztG`hIvmjXzpa<|=+LgiVjaFaLyo0|
ztc&)7B&;ve%3U*Hay0vI)asMvYO7W*(jjg+1;1qdUkh(%ZdT1I@vdQY$Puh$T+dgs
zmB8G}JX37XruVTsP+v9Gl26g0k&w%Ji3WSF)?jV$o?vKO&>rY)475uvp`hNP^8)mf
z7r@`$&}452ha0xrgMn@K)<AHxw1rr8Na2>?X1f#$*;_-w&8#K3wV}18$=)G_TF_u~
zq%9DX1YJtm9*RizP_sSU5ZoNl1gZ=N8l=FAmezo_FjfY_!9c6CxUi|Ul_)AP^4pPW
zp)Uu@t5)4!ldRJ?Xm3xcefjd~f2Ae%$|8Ho*~nA^<cn5J(`!}drJuoh#Z7iFpTP>n
z&kH0tlvbRl_G~5)Im`mAgN0ZGxki!Sz#8yl$ab~?sR6iq@ZOA?LiR;Lsm)+3+BC2x
z=!B>%@s@N7O%K!aAm*n%)X^ele`}yo3WcZV>xa7XexyT+G*X`~uG!I8o(6R?<_hR|
z9SZws#ZM9&Qj845E?Rv51&^!#Y<ZGhOt^J?#rf;me~~=N{%68dy8dS3Cv`c^x|~)W
z=IYR%B7gEXySSZYBZzrhy+}9C<oKT}rw+fjp0P!@q8+6RJVftGsjp7SQxoEme8_Gn
z??MuMsh~fp{aPCs+Y3JMK^J^5OxBxHKZ5+szNs<sO7c$apZKRfNgBe9)iY*?>x8en
z;6n$Y(iHc)9{CH&Kum}y$xKhG9Mn(hlPX6kWPcp>SYsD_h(3{0Ka!HCM#Ller1ndE
zlTR)(X<cbuS+E=W(y~;CUt7S~50Ey)p$=UKAA3E1PmEM|1AZ%x^c2#+EXKHzdZ;1p
zVmp!c+qIuMyU^B!;~IPe8<`EhpqU3UqTOIXh91zj1Bl;UJDOSu)ehVku4gq|n{a5=
zXyclqYYRGxiUgl(@X_cx+1L`svZiRZHz6w;O%P2B{l41qIYPk)uu{OnqN2v;&9KD^
z#>`Z%T#ZjIm8gXtfFr%=I1x3__mvbnd})BqorUv?w(HNv3A*~TaMglt%h@<V*M1hR
zM$mPhjT3ZTz;!{l$={*V8a-u5mK|Y|4ZekS0%|mlt)W(_jg&(E;nlP${C)S`*K{}3
zz+66kd||24;dP6?`B}I-wK1pSYBaj_XW=xudf@2y?1i1$Z`&vC!0+lw9#M9XXpDa6
zzn5^@{2(-E?EY1no#;3x;d+2ena2{sQLIkK3!UyJ!m)aBMZ%K5yC?tC1+*wbEwmmM
zO_w{6W%a;y!9EM`?hs`%NFlfWn|xwW4?6MNdq)wh4COAg5&FjO@f}4%Zo>aZj{$d9
z8O3QuhD;;NEXiP*#To4eqk$Q}3_nE>^O`f?%;w{x&itB8Hos&xo4?xD{u2E8Ug&et
z6L|dyDQ&JDf}|ZvOJh3E>iO4avMZYAvnxt+*%cpNG+`Z^o5*UPQ+>*T^@Jw(LAXUH
zk@*ZMW9}H1)b&L+tk+_Cx6kcNd)xTqj8}~t)6y!8mt`=+JTsfugj6$&&4aA-immPQ
z^C6SrQkFe2XKeP!tc0oESf5^$Ci<xIGxo34haZ_*q_j+8ydW*(Yeu#>J<WjcKnqN1
z%v54z`?0<UknV>l3(zLDY?zzD=9bK1bBi-4%wrk#3og!J7Y}5zxzcQAsxh;Xi@^F~
ze4<1b)b{K$F5y7SK+9&(8f<1}1KtL_tz;In73Yizd73hW&w0TLd(?T751KAxvCN>E
zPr50#PRt$48p%wU+h^5h6ww@2-42^vg;xzyBa+c<MeDQ;$fg;($n|Bs#(tMJ0J#mB
zX*B=UhBO09Lj^rBDO^Cq4i;k0z>muG^93*Fa0MouprEe?oR7J{c;;h{=3|cLV~*w*
z+s4pDvnA*$CpqROj2HDZX5tH(*n{|WPI^9Ln}kK<gDCR%rj&Dpjhb2J>Wp@3V?>+(
zj{3t$5xvb`<bQ?qRlWQU@*k$uQ~9Hm`q{9n%StTlvhXEi^V%=2Pmb|AEK19DjO_y-
zg2JX(r&Sv)8O#FNEs)((Jg40-+rVbuje4_@nZw5R^m?o%L4*1d6SG_d8k-4YeU8}-
zy)1+Dlx<|$C7CRHHFQnN!IOlPPsS+8{gM3s1Z`9^o(UK;J*D6|^MRXV>w)h=B0qP&
zXRKbsruNe{qaQ0sC}yE2mCiMTj_Q;044+3Hn%|kSkPl5hr{Fu83;W#aB!;o$HSjUO
zb*A9{r4|>dzzwJ1_5)YyMtqclo5cBg3vju_SATMGRND=ll0tV2aO;5^O~KUz$ALTF
z^SApLO)IORb9(+?zmF+SyEPzHM#5oS3si?gjR9=QL+LA>#X$Q*O_A1sH`p8sw`s@7
zH(2VufGJ~bOIV6Dw4$Meb1Y;3jksyectfzMH2^C+N;qQeZfXh>d$!WE`gV^md6y7R
zTVA(bKOWa5Zzx<HQj^Q|1^4=DPeqjrQP5Y3O1tK$3xva=@HrF@5CtwW>O#$R;v(Z5
zie08UztmaR5^Rz1s>2C9!ggx7rT{KZLffa%tXsq50DTWW1c`Q$peRMqPtBHaXj@%n
zd;1JoI7IcYSzB4Xq@+l@4Oz<C0&R`$+v$%6w>5U47urMX>M*{#sXL&$#t=~~JO{6f
z1@Bo`+1V+2^`u@L)e(9H{@693sXJVPk9O2!TWD*5Eu&mV0P|u7=gPW{_CRAxb4z30
z7BM%FBv0>A+TI?(*qcLjNkz1_bfDeZ%GI^E*LeM&sqv&@>Xv9@yqTe`xMr$rZy;f$
zK)5a#68wUpa6pQLgJRT}xL}B}OjfsTGl+s)8SY7-5-HRwWNd6`ZN+ug7B-)?AscFB
zY&omz2yCfqZfPZ^borFapsrwZ%jQTpP#44<7-j-y171#&1J^3J@ValR3ca+1LqYA@
ztK=+-P%zL5Q;-_&ZpE$FQdSoZY{szBk6zOp2{wxB6U<DYGtd~30?8_^(N&NoEY;zr
z42;+%D2WWaN$Ur!+Suo(^K}78-y9C0w}$qX#cdsnx3vTpgTvx2frj?QtxFa!S*+X5
zjC%Y9v((ZSNF|v;kuuJ|Kn2Zh4WPf2u0A%dmRc(t+A&Lk$`C#w<L`0*L^xk4bWfyx
zg{}inPzu9FjV9FS%f2=U@tYX?gQ+&CnN-u1b>ij_qi5_9)0%*E!Ri514OG+;gaVV!
zhdrL|?a&LM@Cw{QLau5!4!XD8i@K`7-I2|k1K}jD-MA_e2yd?rgoU39HewXe7CLvH
z>)X6d?DHvDtf)Xk6Ob%39bRh9cFcZT4HWI}psP>Hu|4VDDWh8BgMDx`(Kd&_z5kar
zz<Yc2M;#+(mR)}x%jB2dzpm9Z_0f&?<IS&9<fq-08Bj&BoOUu78LcR?({XI6=j{8;
z!sYI@Q~q4rc|?oz(cx|u9t(H(b#Qid+NPFlazT1>he;xEJ|Eqb7k9aIY5y+(2*Bw#
zg>){(Hy!5J^VNWDdOr1RNN2>2If%t^ZX~!J$%wNa!5v8Rkf-m<FJ6RmG4iQrRXW2K
z&citjZ3&hj?MI&AEl3IEDek`?iSAP9tnf2EPv?_`IFAsX4%rXr`5r(;&*NJUTaB~@
zH1&Yy%NetSrxkELKGXk<@PMUP;Vg~33vd7_3p68u6G#&91P%IG-3qus&ldr@^?Wtp
zSM_}AS)R`LciPbpcoJ+vl91mIIA;O!(1{&z8B!PWF2MVdXk5Dhe@<oO6M(1mJi*xu
zHGCFeiJm9u)$=~UCy{6@1mDu}1Sj-7!Rv9hCjK`7K8r;C_5xNr&_CoMC?OG^;P>?W
zUcfi>{9Aw@ArT+CYw5^CpJ>|y_$#Dg<mnD{4$j-eCkt=`644V3<9s{<8VT?eQWnmS
z1oLnXu1B8!&y4_55As_8ze{+uB^bOOXExy50e^$^IPymP(!_y8b9VzE{T=8}fIkI@
z@0@G^c^BY&NUtJqy^*m3B$B5DupNnPhTxNW9^XaT-AH41V4eWKf}|i%7aF}tt&pEC
zlrol}FSMo0DY~zqJVCl+cmy;A>F$8=1nJ&@@&xJZPkDl)NV~!RfA3=ucfhz0=sH^t
z+}8ks;huxXj|Um9UB&(2mkejOqSDgkoo%gl#5^7N)>@vwq_8O89tbvun(&phJioSP
z#p2R@dxwO8xB=fw1LgVK10DIxmt|)zZRqF-wB6mh-3|u9j`Dm2vA1+IZV9wCbS!Rb
zX$*%tLe0|R#!%ZW4IOQTTbJb9+Zuu`%{WM`P3;Y=?DnNnIMN}}NlNFo@IT<@TqxS1
zWe38}aEr8EF9Q<}+#5kJfu`zk%T`1wn*$wFm8sPp5wT*}zQEQ%E4~rqU7p|2;SFvL
z-4h7s+aoRRMmq47=QlUBb_DY6H%{?cdgFzAS$gAHGA+GvYH(=2^v0y#P&juw&c(R2
z`I~rX@*%d*ywAGNzOQIs=|0!K(S2k4lzrxhtq<ouY=3ys!$l7lJzDxGf3*71;YY_F
tRUU1BZ1-b5kA3^Gy^lTq7}(Z}PaCXv@7P}JL!}R$+tJ@J|0inTe*#t*dpZCB

literal 11264
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
E--IJ}WB>pF

diff --git a/launcher/NapCatWinBootMain.exe b/launcher/NapCatWinBootMain.exe
index 9cd3132b9ee6c6145708042001196c6538557fd2..5d054fbd86a195c88213c27eb279b5e6119a859c 100644
GIT binary patch
delta 27
fcmZqJz}T>XaRUb<^LPJeo4FZp>Vp~24J6e8nwASo

delta 27
fcmZqJz}T>XaRUb<GgrpV&D@MP^}&qi29oLkgr5nC

diff --git a/launcher/launcher-win10.bat b/launcher/launcher-win10.bat
index c70be0a2..9ed9b106 100644
--- a/launcher/launcher-win10.bat
+++ b/launcher/launcher-win10.bat
@@ -9,7 +9,7 @@ if %errorLevel% == 0 (
     exit
 )
 
-set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
 set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
 set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
 set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
diff --git a/launcher/launcher.bat b/launcher/launcher.bat
index 370bd1b1..c92f57b4 100644
--- a/launcher/launcher.bat
+++ b/launcher/launcher.bat
@@ -9,7 +9,7 @@ if %errorLevel% == 0 (
     exit
 )
 
-set NAPCAT_PATCH_PATH=%cd%\patchNapCat.js
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
 set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
 set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
 set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
diff --git a/launcher/patchNapCat.js b/launcher/patchNapCat.js
deleted file mode 100644
index 83a04e1f..00000000
--- a/launcher/patchNapCat.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./launcher.node').load('external_index', module);
\ No newline at end of file
diff --git a/launcher/qqnt.json b/launcher/qqnt.json
new file mode 100644
index 00000000..9d3ef880
--- /dev/null
+++ b/launcher/qqnt.json
@@ -0,0 +1,23 @@
+{
+  "name": "qq-chat",
+  "version": "9.9.15-28060",
+  "type": "module",
+  "private": true,
+  "description": "QQ",
+  "productName": "QQ",
+  "author": {
+    "name": "Tencent",
+    "email": "QQ-Team@tencent.com"
+  },
+  "homepage": "https://im.qq.com",
+  "sideEffects": true,
+  "bin": {
+    "qd": "externals/devtools/cli/index.js"
+  },
+  "main": "./loadNapCat.js",
+  "buildVersion": "28060",
+  "isPureShell": true,
+  "isByteCodeShell": true,
+  "platform": "win32",
+  "eleArch": "x64"
+}
\ No newline at end of file

From 7275066994b1765b8532b49becadb920abd1054c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sun, 15 Sep 2024 16:18:43 +0800
Subject: [PATCH 3/8] feat: skip Qrcode When Login

---
 src/shell/napcat.ts | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts
index bef7f21b..e28c75dc 100644
--- a/src/shell/napcat.ts
+++ b/src/shell/napcat.ts
@@ -103,18 +103,21 @@ export async function NCoreInitShell() {
 
     const selfInfo = await new Promise<SelfInfo>((resolve) => {
         const loginListener = new NodeIKernelLoginListener();
-
+        let isLogined = false;
         // from constructor
         loginListener.onUserLoggedIn = (userid: string) => {
             logger.logError(`当前账号(${userid})已登录,无法重复登录`);
         };
 
-        loginListener.onQRCodeLoginSucceed = async (loginResult) => resolve({
-            uid: loginResult.uid,
-            uin: loginResult.uin,
-            nick: '', // 获取不到
-            online: true,
-        });
+        loginListener.onQRCodeLoginSucceed = async (loginResult) => {
+            isLogined = true;
+            resolve({
+                uid: loginResult.uid,
+                uin: loginResult.uin,
+                nick: '', // 获取不到
+                online: true,
+            });
+        }
 
         loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
             //设置WebuiQrcode
@@ -142,7 +145,7 @@ export async function NCoreInitShell() {
             if (errType == 1 && errCode == 3) {
                 // 二维码过期刷新
             }
-            loginService.getQRCodePicture();
+            if (!isLogined) loginService.getQRCodePicture();
         };
         loginListener.onLoginFailed = (args) => {
             //logger.logError('登录失败(onLoginFailed)', args);
@@ -189,14 +192,14 @@ export async function NCoreInitShell() {
                         .then(result => {
                             if (result.loginErrorInfo.errMsg) {
                                 logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
-                                loginService.getQRCodePicture();
+                                if (!isLogined) loginService.getQRCodePicture();
                             }
                         })
                         .catch();
                 }, 1000);
             } else {
                 logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
-                loginService.getQRCodePicture();
+                if (!isLogined) loginService.getQRCodePicture();
             }
         } else {
             logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
@@ -204,7 +207,7 @@ export async function NCoreInitShell() {
                 logger.log(`可用于快速登录的 QQ：\n${historyLoginList
                     .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
                     .join('\n')
-                }`);
+                    }`);
             }
             loginService.getQRCodePicture();
         }

From 66656304f991ab2b0c4fe88a178347bc2522a972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sun, 15 Sep 2024 16:24:08 +0800
Subject: [PATCH 4/8] fix

---
 src/shell/napcat.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts
index e28c75dc..6943110f 100644
--- a/src/shell/napcat.ts
+++ b/src/shell/napcat.ts
@@ -141,11 +141,13 @@ export async function NCoreInitShell() {
         };
         loginListener.onQRCodeSessionFailed = (errType: number, errCode: number, errMsg: string) => {
             //logger.logError('登录失败(onQRCodeSessionFailed)', errCode, errMsg);
-            logger.logError('[Core] [Login] Login Error,ErrCode: ', errCode, ' ErrMsg:', errMsg);
-            if (errType == 1 && errCode == 3) {
-                // 二维码过期刷新
+            if (!isLogined) {
+                logger.logError('[Core] [Login] Login Error,ErrCode: ', errCode, ' ErrMsg:', errMsg);
+                if (errType == 1 && errCode == 3) {
+                    // 二维码过期刷新
+                }
+                loginService.getQRCodePicture();
             }
-            if (!isLogined) loginService.getQRCodePicture();
         };
         loginListener.onLoginFailed = (args) => {
             //logger.logError('登录失败(onLoginFailed)', args);

From d0f248aaf92a5276d1747f609ee5dcfd9df14d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 16 Sep 2024 18:53:26 +0800
Subject: [PATCH 5/8] fix

---
 src/common/qq-basic-info.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/common/qq-basic-info.ts b/src/common/qq-basic-info.ts
index 857572fc..91570676 100644
--- a/src/common/qq-basic-info.ts
+++ b/src/common/qq-basic-info.ts
@@ -61,12 +61,6 @@ export class QQBasicInfoWrapper {
                 return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
             default:
                 return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-            case 'linux':
-                return `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-            case 'darwin':
-                return `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-            default:
-                return `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
         }
     }
 

From fa07c2c1fb20f495fa5c75e91ad838391e12e2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 16 Sep 2024 19:31:24 +0800
Subject: [PATCH 6/8] update: appid

---
 src/common/qq-basic-info.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/qq-basic-info.ts b/src/common/qq-basic-info.ts
index 91570676..2d5aa328 100644
--- a/src/common/qq-basic-info.ts
+++ b/src/common/qq-basic-info.ts
@@ -69,9 +69,9 @@ export class QQBasicInfoWrapper {
             case 'linux':
                 return '537243600';
             case 'darwin':
-                return '537243441';
-            default:
                 return '537243538';
+            default:
+                return '537246092';
         }
     }
 

From 0c7bbda936f2fa1f95a6bf3f15a0761706174888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 16 Sep 2024 20:29:04 +0800
Subject: [PATCH 7/8] feat: Linux28060Appid

---
 src/common/helper.ts         | 16 ++++++++--------
 src/common/qq-basic-info.ts  |  4 ++--
 src/core/external/appid.json | 27 ++++-----------------------
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/src/common/helper.ts b/src/common/helper.ts
index 6b281f62..2412f1cd 100644
--- a/src/common/helper.ts
+++ b/src/common/helper.ts
@@ -163,8 +163,8 @@ export function isEqual(obj1: any, obj2: any) {
 export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     if (os.platform() === 'linux') {
         return {
-            baseVersion: '3.2.12.27254',
-            curVersion: '3.2.12.27254',
+            baseVersion: '3.2.12.28060',
+            curVersion: '3.2.12.28060',
             prevVersion: '',
             onErrorVersions: [],
             buildId: '27254',
@@ -172,19 +172,19 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     }
     if (os.platform() === 'darwin') {
         return {
-            baseVersion: '6.9.53.27597',
-            curVersion: '6.9.53.27597',
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
             prevVersion: '',
             onErrorVersions: [],
-            buildId: '27597',
+            buildId: '28060',
         };
     }
     return {
-        baseVersion: '9.9.15-27597',
-        curVersion: '9.9.15-27597',
+        baseVersion: '9.9.15-28060',
+        curVersion: '9.9.15-28060',
         prevVersion: '',
         onErrorVersions: [],
-        buildId: '27597',
+        buildId: '28060',
     };
 }
 
diff --git a/src/common/qq-basic-info.ts b/src/common/qq-basic-info.ts
index 2d5aa328..4209e974 100644
--- a/src/common/qq-basic-info.ts
+++ b/src/common/qq-basic-info.ts
@@ -67,9 +67,9 @@ export class QQBasicInfoWrapper {
     getAppidInternal() {
         switch (systemPlatform) {
             case 'linux':
-                return '537243600';
+                return '537246140';
             case 'darwin':
-                return '537243538';
+                return '537246140';
             default:
                 return '537246092';
         }
diff --git a/src/core/external/appid.json b/src/core/external/appid.json
index cdc03108..0c5c764c 100644
--- a/src/core/external/appid.json
+++ b/src/core/external/appid.json
@@ -1,29 +1,10 @@
 {
-
-    "3.2.12-27254":{
-        "appid": 537240795,
-        "qua": "V1_LNX_NQ_3.2.12_27254_GW_B"
-    },
-    "9.9.15-27254":{
-        "appid": 537240709,
-        "qua": "V1_WIN_NQ_9.9.15_27254_GW_B"
-    },
-
-    "3.2.12-27597": {
-        "appid": 537243600,
-        "qua": "V1_LNX_NQ_3.2.12_27597_GW_B"
-    },
-    "9.9.15-27597": {
-        "appid": 537243441,
-        "qua": "V1_WIN_NQ_9.9.15_27597_GW_B"
-    },
-    "6.9.53-27597": {
-        "appid": 537243538,
-        "qua": "V1_MAC_NQ_6.9.53_27597_GW_B" 
-    },
-
     "9.9.15-28060":{
         "appid": 537246092,
         "qua": "V1_WIN_NQ_9.9.15_28060_GW_B"
+    },
+    "3.2.12-28060":{
+        "appid": 537246140,
+        "qua": "V1_LNX_NQ_3.2.12_28060_GW_B"
     }
 }

From 4885d4db86c4cd359a550e7756b596ae6d63a860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 16 Sep 2024 20:33:27 +0800
Subject: [PATCH 8/8] support: linux28060

---
 src/common/helper.ts | 4 +++-
 src/core/index.ts    | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/helper.ts b/src/common/helper.ts
index 2412f1cd..11a6222f 100644
--- a/src/common/helper.ts
+++ b/src/common/helper.ts
@@ -191,8 +191,10 @@ export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
 export function getQQPackageInfoPath(exePath: string = '', version: string): string {
     if (os.platform() === 'darwin') {
         return path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else if (os.platform() === 'linux') {
+        return path.join(path.dirname(exePath), './resources/app/package.json');
     } else {
-        return path.join(path.dirname(exePath), './versions/9.9.15-28060/resources/app/package.json');
+        return path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
     }
 }
 
diff --git a/src/core/index.ts b/src/core/index.ts
index 6f9791eb..0a44c32e 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -45,16 +45,17 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
     let appPath;
     if (os.platform() === 'darwin') {
         appPath = path.resolve(path.dirname(process.execPath), '../Resources/app');
+    } else if (os.platform() === 'linux') {
+        appPath = path.resolve(path.dirname(process.execPath), './resources/app');
     } else {
         appPath = path.resolve(path.dirname(process.execPath), `./versions/${QQVersion}/`);
     }
     let wrapperNodePath = path.resolve(appPath, 'wrapper.node');
     if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(appPath, `./resources/app./wrapper.node`);
+        wrapperNodePath = path.join(appPath, `./resources/app/wrapper.node`);
     }
     const nativemodule: any = { exports: {} };
     process.dlopen(nativemodule, wrapperNodePath);
-    //\versions\9.9.15-28060\resources\app\wrapper.node
     return nativemodule.exports;
 }