From dc0018512f33deb8123d060fd884bb9cd81673ab Mon Sep 17 00:00:00 2001 From: Anyon Date: Sat, 21 Sep 2019 14:36:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/queue/task/Listen.php | 2 +- application/admin/queue/task/Start.php | 2 +- .../task/bin/{process.exe => ThinkAdmin.exe} | Bin 106496 -> 106496 bytes 3 files changed, 2 insertions(+), 2 deletions(-) rename application/admin/queue/task/bin/{process.exe => ThinkAdmin.exe} (58%) diff --git a/application/admin/queue/task/Listen.php b/application/admin/queue/task/Listen.php index 6c646ce81..4a2015ca9 100644 --- a/application/admin/queue/task/Listen.php +++ b/application/admin/queue/task/Listen.php @@ -59,7 +59,7 @@ class Listen extends Task Db::name('SystemQueue')->where(['id' => $item['id']])->update(['status' => '2', 'start_at' => date('Y-m-d H:i:s')]); $this->cmd = "{$this->bin} xtask:_work {$item['id']} -"; if ($this->isWin()) { - $this->cmd = __DIR__ . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "process.exe {$this->cmd}"; + $this->cmd = __DIR__ . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "ThinkAdmin.exe {$this->cmd}"; } if ($this->checkProcess()) { $output->comment("处理任务的子进程已经存在 --> [{$item['id']}] {$item['title']}"); diff --git a/application/admin/queue/task/Start.php b/application/admin/queue/task/Start.php index 8bd9c4937..50868de74 100644 --- a/application/admin/queue/task/Start.php +++ b/application/admin/queue/task/Start.php @@ -68,7 +68,7 @@ class Start extends Task private function setWinProcess() { if ($this->isWin()) { - $this->cmd = __DIR__ . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "process.exe {$this->bin} xtask:listen"; + $this->cmd = __DIR__ . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "ThinkAdmin.exe {$this->bin} xtask:listen"; } } } diff --git a/application/admin/queue/task/bin/process.exe b/application/admin/queue/task/bin/ThinkAdmin.exe similarity index 58% rename from application/admin/queue/task/bin/process.exe rename to application/admin/queue/task/bin/ThinkAdmin.exe index e2621b7adf862afc04e2a8f9fc8b48ba9ab48c49..3227aca67b409f005bd316009f6d46ea9816e3a3 100644 GIT binary patch delta 2234 zcmXX{c{r4N6#h_jix|797-Xs2#TffmGh<01G9zSPvb**X#>h};nhDo-Mahx~lfl@R zC|RaKQ?hllW)E4eNxC1;eSXjHIp;m^Iq!MD-#=emJ9k_=HVK)lp#Ke5ZIi+ zvlajV$~XbjqW~{Wjx)24pr-|M&59VRqOBw4mg?;%RB-+(ryXU(d%`4e^5v~oeb6YH0-8*54aRmxi037jn3~VL&rIk?-p?jFa2FQM!MFcGG0OS)tVVM#Lw8-C48*X zEHyTgmQg6C>gd7fGS>(&8pJe66dUDeOo-fZZQS7zlRsTjI_J+ceYl7_Yr{x*yS(V-ZiV7%JB{)*mW}sf73lA=A6qH!54E}%DqfAIKBm{b zGSphpf#~?+kr4$;j->a(&SJ~ylxns5K=Cg5_PBpK&85!_xj7sg*xETVEb#b}HfQKv z>a=gRS`3YmnO;LsVVGrky1g@K)bG_dm)o6!x@bpd%0?gqDhh4LNlMnU8#dru!Qmu8JZAN`&i7*4R*c{lOl7M{RU#w>BRgk>3p6PNGgF z`X@ZRL1R*zF;03SmJKzM6D6$c%DusMF^is4V%14RIfAr!M`!NV3;JZHcgtr^QB9_Q z@(5DCmunorn1w7~-o`EO`XucM^$^Z*@N{?#K__8XJYS9>x3^jh25HlGz4!I3Q*1;g zc6ux3KdM${jkoq6T%Ux2m%i0YwF+)d;S+kPkRi&-jOui_XQ7UT8~xghhEy z`k>2#q{MT~^+mH1>o%r{^)*G~iEocZS-H@-!YOeMNyT-{=JT^*se--+{L5W15-;x& zviovj4$05#VP}27YPE+ZsVfT?7!Xlbm3fPB!N3wV=U+@sGVrS*@;c0(oD4$1?_s$E z>~@?*LP-kQiEYoyS|DBvtbqq;{MkF7I;FD~jEb@RjZA#x`I{3Zy&>=3nQi4UHq+t6 z0d3blyC&XKZ)#gYe^478>FY-Q8`6>-!Ej9lP2=k~G}dMz(%;c+yHNM#i^prbC831H z5TCkL%z|8qU&Q@|7Y|Nw^=+l1^GinZDf60z^5!#Pe>UOlb5ui4o-{ajD$v_`us8T# zSs-x*lN|e)@zPM@S6|+sya>=o%@;Onp_k&@UF1fA+Gt#PF=+BNZl(MGBp7y)1&`_uWp> zUT*sh9ck75%@iTSDXef(=~jSrnO9!zHR7>Er-Am9JS0utvHkZ}i=@6VVSr8;{c1B? z5KonEWc09;P=QwhXC>sd+T0ucU+=AZmQPh?ieC?l$434f_zA%gQOZSA2n*|p?k5^! zg~kf3sG_(+ug}p-mk=pwEd%`HmE63gPxSwoIWn=AuT>YoWV^L?oti?Ni-ng&R3^ta z=N8Gx;@nrO0=LU@4Is3R`DVhXXYKK|QIT=IsM%-JHqyNdV{aT?d@w`75Ni+hHq9N*D@dr>P6!(V${`QIzEBqQb7Y#-Jm)45S> z%rDl&+U@?eWe7R@hdGIuLz!83dmTm<#5168GMe!9$u5Ln40{OMlKnE9vc{{NhV3`s zm>m2E7*_aWb^fss*Iz~!G0vE6OiCqAhXaanh@ zn>5JSFQYKG4BzoN{$)xJ>1lp_lz-Tuc~8N%B#rIOI&LYde5^T!yNYZe7$Ww3GL(_V z7TTuo7_AT-zMwtY3jmijKUHU@&?gbOAteaIvvbi5G88uEy;mv<8-06wNV~U|xuv!- zTh!J0F1A|0BhUXidEfuWl)!j~?TLswvJ%=k^71#&C&EaR1d;t*(oY|mV&{stmzQ;| z5rSjhH&-Mzt&!ZR_ZKOmzLPMaGECCaiv>TEKwYUpM#6Myh1O#Fr&7B#8e7lpIiG^- z;*G|65>HWi!iDtyHU*Ai+Gg7$UdR}xHbrn)^-x9|j0eWFL4gAU>L9BQRt_*4#H!#zb#OHjR6Fe>f^P&~0DJ}xfX2;?=;1N|PGk|XIpjnzfH&X+1Ok4bj0X^K Nm;>~NYz`Bi{{X$%=q~^O delta 2236 zcmW+%c{o&k7`-!$?8{iP)QoNHB-@xiveUE(A@tbyG$@HuhR|2mVK9!im0VEa@Dabo2qmBY@cU5UbqfFh zB~Snh18Qqf(DXX|xr|PZ*#!kGyFb-SFe@20ZaYbH3;P{TXVl6_jr72+sRAjL(y>kU zL2%p(uDeMO;w=y_U?}hF0m->iDdqOW@xc9Z$#i5#zf7A_8K0jpA}Jtkdo@lVa@gSD zZ0advdEtGzO&0>i&Y?T1(GY_=lOOO#2WY@utzHU@7QQ@+ZUa?Y71JQjTMp%HxMl;3!!=6dX`4q-nt%PMGpnv-y&+ZTd^QW4d?~%n(XV%i zQz+AJU7(MKXC`l*DHt96n9~(^bxJT;b|+_Ez>1tU$wHLm9lRzxo)IJD8}x3~xXiRo z_rUJ;t_7a_$k7Y+rCG6sFl;G*nsqV}HYIJ?DwXYgFE4n6bY&WOL69?a`Dc}&LHeZ+ z#Wv^G1$z#GOY}kmodTP@D zbtbNSjz4WJY-k

d+uIe~Wn>_25gth+L1m!UW#_j#}Nt2mDPPpKDlsPBO?%S1KOH z=TkXiN8zE;_bnDVqKA0O9bcq>`{irKg`-SmZ*bCHbW0m1CPbU^bki-V-I1R9$riCx z1cfgErkF>1$H%!&Aux|H8YFoerOMG2TEV)kxwx#t#Uzgpk9Ef!+6v1ngTli1AJcpR zBfNl4@#_U*g8}qBMDOC}gSzbuOay`)8j-88#)GlAT)`B9Rk-vhEkAl%Y*+CI>s{R< z^#hW5d@Ap>BX8&Z%R;d%qb+yWyo4Z*dxj>bLf>@LlRjnI;@WC7OZYiW52n9r&5X?> zzHNkNk+YWI1!4RDwrp8O>Io^BGG=bDe#FNHawTQy7K)(y<@L1p5q%_S>8}3Ua2MJ@ zRgGtP(u9vE+2MLdS!E02ftNwa>FS1%pRDCJMQ$8&Og)i_9esm+F-jGBRz=W_=PoMg z9Vv)YqQ0Jyqw7&}n{m@TG@loq#tAI%)CnOn?0TZTyB-Nn>MxBLugx!(n{Yjc3*i zI2Bge(Wj4vapjl=wUF!y@ozh*dHM7L-S~f~m~5V6G-_)mbeXud!)_nCk!fNjr+cn6 zN^-e%&6P#Jz+3&v=M`cZg}`G~is!f`Do<{%>Q;YIKKkDFkBFyiPdc2Sm|Xaq3zWMnxGAHl9dBw(BZ-7ej$!`0;u-Xc0PCfl z+WxDzoPT1n6C?GQZ=%1(xed}CzAYxZ{>96o=}KI&_Y8zwr3Veb>+R?R%->%xLG(Q}3mX`zVJoVoNp@bMmQT1>QU=3*FA5C1tn2M= zO%AylV^-(-$2P)j+GP^|eec7bXYJahn6Ur7U*gGlZgQ5|*IAlNw*0|6TwGu6Z zO^GzU@0FiJFHS`LY(_a6=Ve#rTwmMy-4VX7Or7<=JDhVh2XF0s(#a>--AXg2p^Lg9 zlY+KjtjLtKXT?=U*KTm6#`b(R6>nSQF6vTXDDtj>TMUWZ`|K4Vrx~`P{h?en44BpYE)0DB`p7hYh6Sdi;3I>^xQ|3~7@dBpRVNqR|pHRz4N zOr1;5+}Hf~qVP}AnD;Fz-Jxck)P=G2k9Em^^SHZjai4S{+Oi5ZNj+1$&X{5|Ynr%} zx8|xLw|9r6CcURvChKnWji&DPJarAyDBN24xP`UG75>G=iPIq{p}xV)9hepwTV4`= zII}c)E0&1dVo~DvMn+!U&@4|-4AISA#c>nP#|Im03uvK+y$|k_-a6kxHcdT`wk|>iF|`n zY`hQv@c01*gox_{NSHR*JtVddAc=N^m3VeQ4KM*q9nb;{0961D7=k4Z_NHKAKyCzb zV=!e3a&-_5k5gzctp#X+c`Z=U05m~W4b+Z$6OhRr&oclWWALk^oB=ou19C&q(LP3P z0D}j~(czk)d^AQ4461^*38<(6XF=y^Jyp;%0+%v4){hoFa?xO^9S=J?SQ|_jgUVSD zjgDuUf}Sdaq1s4Nv348(Y8X!Oo%cpyNO!@#P37-K$2?hdpfB?W9@C1Uu QQUNg(@T_mlfS8^5AHfae3jhEB