From 6e7446f53060f760e1517deb8722be5445d6c7ca Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 27 Mar 2019 11:12:34 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0task=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=85=81=E8=AE=B8=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=91=BD=E4=BB=A4=E6=9C=80=E5=A4=A7=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E9=97=B4=E4=B8=BA60s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/permissions.py                    |   8 ++++++
 apps/jumpserver/settings.py                   |   1 +
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 69760 -> 69791 bytes
 apps/locale/zh/LC_MESSAGES/django.po          |  24 ++++++++--------
 apps/ops/tasks.py                             |   8 ++++--
 .../ops/command_execution_create.html         |  11 +++++--
 apps/ops/views/command.py                     |   5 ++--
 apps/perms/utils.py                           |  27 +++++++++++-------
 8 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/apps/common/permissions.py b/apps/common/permissions.py
index 10ef329ed..67154b228 100644
--- a/apps/common/permissions.py
+++ b/apps/common/permissions.py
@@ -70,6 +70,14 @@ class IsCurrentUserOrReadOnly(permissions.BasePermission):
         return obj == request.user
 
 
+class LoginRequiredMixin(UserPassesTestMixin):
+    def test_func(self):
+        if self.request.user.is_authenticated:
+            return True
+        else:
+            return False
+
+
 class AdminUserRequiredMixin(UserPassesTestMixin):
     def test_func(self):
         if not self.request.user.is_authenticated:
diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index 02e48c3c4..d516c097c 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -475,6 +475,7 @@ CELERY_WORKER_REDIRECT_STDOUTS = True
 CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = "INFO"
 # CELERY_WORKER_HIJACK_ROOT_LOGGER = True
 CELERY_WORKER_MAX_TASKS_PER_CHILD = 40
+CELERY_TASK_SOFT_TIME_LIMIT = 3600
 
 # Cache use redis
 CACHES = {
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 7196bfa06fc852332f3287f7f17f6c56a1276e04..3f02ced3b75f39c7e05af529afbaa4b798798876 100644
GIT binary patch
delta 19199
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

delta 19170
zcmYk@2Y62B|HttYLWCF*ga#2oY_%Js5>3olwYSDrds94CDT?Z2m)dHVM%5lwTdQie
zXsbnkMr*WasrtP?xxcQ<xvukn-QVv$&wb8$o+tYIFIg5ic3GhB$LxV~JdPb{Jufd_
z%jbE|0zGd-Rb@SIX(P{@j>~W)mTByHQ*j-R#fnWl?@WN_ZNo2dYE#dPNaJ}8nv<u#
zXG=G3^;VvjowyAKV;{`vc|LC#h4dt*V`iL<nQ%Gg!c7>7hmdu7*Rd?#!fKeewdWPX
z)|ekBU};>Ao$)jl#)@s+#BH%Cao1FRo;QQSk0ic8O+2@)=Y`>N)WWu*c4iOez#lLO
z?_w5wjOv%Zo#%yMb~6$+PD#`_ab|7Qg*L>j%<r|M5RSc3158BjhBphfRdX;eE<x?c
zZq!zu!3=l<Bk(S=rCz4?Zb4C~`chaBD`8%2joQhf=+l+FLm?YZKwaT%OowYRBYtY`
z#8Bcxm=!NzGX93TqIw-XuL!n6-4Y-6!?idF^K|sQH*q>P#h*KJ|5d2a$yL0Em5DE*
z77+H9+qyic9VvjicZDzp8=%?^!32B<b?^717J3(TYXVqhBxXk4l2WJz$0xJ@+KNUb
zG*C0tEog(fx7|@&J`^?3bjvS5wOfN4=yR(-h=qtxp?2;s)Hu(v6lURx)Ge)s>R-!8
zK^>Z+ZozQWy_|x&m#gp<+=bfm^QZxDm=948S6~-cp9!_l2-E^%FfEotwX1}ISRJ(h
zUrh>{sF784MQvR#)JjKTew>6_z$$zdKezfDsDbZU{bS1qb#*%$irS%YvoNZCd8f~-
zLO}z^qpqw8>K=8%Kpc#ENJpUFl5wb8vH-Qf&8Pu)q85Gt^WYiOj{c6h@jui~gm-iO
zB2wl47q&zhGuC_q_4+hG4b%c-u{);6WvGR%L0!ORRQvs?_Qz1S?guQ04^a!t-Q6vq
z9F}H&uNs9i_%`Z_Kf-jl6t#7$QTJ*q2H^qo7;50tSPTC`?LgHYZigD6ZfzIT&W^Nr
z3TlU!pihMq3fiJ0s4MvyHQ_yrpJ4{#%st%#a-lwe@}q7=S=2)7SbYoBgdI>j(Z?KP
z^)peQGxK`#{%hh5BsAb5)YE&>8eTK+pa%TQ;<UZof-<4n=fLt<0MlbLRQtB5x2YFu
zXC|R8Y(DB)TGfmF52mn(gtqDk>YiOeUD@BLE6e(}8!#VgfRd;M$6`iILS0cy)I_~8
z6OKWRJJsT)sD*7nJqx>hRyc<m@GfS;G`-zGSx^%cz#uGv+S2l<Ta|!XU^CQ(B%_|8
z-WY-dP`7T3#gkFv&qj^oTS`GI+Jc&BKWYa~SbPID@O=!yr>Frl^l=LeMJ+5EwV)EH
zXR0ddRy4xQ*a9_i7gW3c$h<ypECsE2CaS}1+>IZh25!~YP29=sgId5y)I<|d{pX<;
zx(Ib4tFZuXL4AOIhxPD2-otABG!FN_RDU->CDa0{VrHy~nxHYJt{gRSf2@rous9yD
z{2kPSAEI90XQ*c)?Ev>}m>W~aMa|O~v+4bBNkJ>_ff`^CYNB_{iKs1`j(SEGBOhko
zW-N)h2D)#(H!utFK-8@ohkA%-pcb?Wbs_6f^L&9mtz;hsbv%rk_#CRkkEn*%Q0?xZ
zuHaA91ObEG7H2`lWl;UAq1q>+`X`|#Zf5yTsD*VO#Qv+p7;7-u^kW6`OHc!!MNNDa
zL-8(ZM*;@B2|`ir@}OR;BB*B~4)u#C5mVm|)O@`$42KM6|MfvIg+u{dhS~8;)BxwO
z4E}(cIO7m^C3#T;7e%#8L`_i7;%2CcTB8=0jM~wDsCGlJ2>N^!(ok4!u0?&OZ!k|`
zec}iBD!x9{EvO$x5ih|OcmV5S?qTlAl2Nx{C~5(tQMY(1>Q*d3U4U;Dg)S7n#LXBp
zoCgsv;tq@-;ePi&#eBp=N4hJUjk==6s2x~g@fy^QZ9?7qA5lAT1GRv=s2%vv$^C!F
zZEbec))zu`sBFfe?tNXXfGtr2ypOt)x#n`zTeQjI9jGlnWcfR&g+9h?_%CkI`=5D~
z=k+DA6ZHe3*l0I!Db&`*qOP<SYJw!x*0w|~tOMr4-c~;Wa}v)$UC2s{H=-WegQ)gr
zFpJ**TNE_#Kd6BN$GEM_gxaz&)ItiPp4u`Pfp4I8tRw1~8Hj2>2i1NhYKOL<#@~aw
zz@u0gPohs(_P`qajp~q=RcY(=*NHk-LT!0G>Wb=H+|24bpeF2T@le!4$6+|mL0#BJ
z)B?An9^QjK_FpTyPC{376ZQV48|$8lNYw9xvZ#scVKHoqnqV|)p|emsu^n|~Cr}gJ
zN8M|0oLfMsnHzPXky@d4pacoso3fY><53fLG>2mj;#sJByBhT{?M6*}0JWgAsMqR$
zm><)PcYk;kG80fc*#*_VuaAPRY!GS-M_I)b)Yi?wG`JeoaV=_s6jZ-&QCIjq>Q>!C
zeNa6_?P$;hH&HaIz9{N~%cE|IFP4Hj#GwXy6JNp3m<Gq7-s5qo0j8j~d^T#qyHGoD
z6t(4-P&;)CwWH5b?XpgEKhg4{#%qk+0-x84g07?sro}$iU;t|15te@+wSW&$?LR^d
zyb|>qZoxp@hq}VAP*->y)&4YUfj?jwyos6h{^xnu-MbjGDr)N+p`L;6sGS*W&O%+;
za#Xv|P&;@W3*u$-Icma!lib&HSya1D=0HsS`+p(@-K*K=X4Dp)L`{4a)8TdVHtOlU
zk9z2yp%xlC**zo0QCD06bt|i*9@<u@9qo%Xa2)z#C>)?r2ydbqW_i!8xDW;sH$@HD
z%6tp8<-Je~8ID0X5w$b#V+LGgu0lP$n^3oKJF4Bm_t^h(6wZ*))})`}Cd`d`i1J~5
zEQea)7>vXfm>v(Jo`K`$1=LPm!(hCHYWEjvhn}Jqnq#VaJ@ZcG{%eb?lF(Kqp$6!V
z>evU>VK8ceqbxrIb#LdOc3>rH=Qg7ruEUmpgld;&n)`=~P}I0punorhD5$|Ab3JMS
zJ5g7#AGH(5u{{2SY9IE#`w}ULC5dBEA6(rmKM^w!e}uYKD^U}Fh8ll|#lC$MbdL{P
z#R=4Fc-k7A!w}-js0H1`jQA&J!v9bYRmSPAJ|AkKF<1=STK-+kOgz)##ZI61iB)Vt
zt#}_6#-kShfqGaTqpmz?hP#qnSb#Vm>ejrDYS$QbOFN;yO9o&FPD8yd^Dzr<z|{AD
z7X@9>vD5^w8)|@GP*?aTYJlfh97ATh0V<;gtc8uR4XXV*)Q)UJ^*e@H@jPm$Z=fE=
z+nB)f=LLS?-v7F&50tK$8AqcYzG;{R{pNDi!?p!A@DbEAa>45FpceKNwWC>Qxp8uv
z1yK2-nEL%+mV#DZ8DsDb)Wh;NYNZ2FJ2cJmb5R2<ws^I<5!G%hYT^4(7jnenbEpfs
zf<^JpEZ%=@NzM=5!}AKNLm|`_mNOGkuV*XN4h_Q8dy0A}=VLZpj-i->x`0Edoj8fw
zv7b?I$s^PS=kT-t>QKP%{x~d$ibrF1oQZ$pa?}KKXS<0%K@G4KwG;bM3pr--8H+EY
z`rSb7%wyET)68)fn$<@^?_)mH3ZqdI$D#&KGMl6BbqCZA^+gRl3N`U`RKIzs3s{E*
za5rj)ub^)2FP6_Z*VX$<P|&Z@B-Fj`jQW8w3N_&ZbFJlfU`6uhQ4@vCbKiRTF$Zxx
z>fW}%DD<HwUWPsK7$#u(`Kj%F-f#-bNKD7!SZ0CyY+i%W#7A%^-bPKZdLjQ}j=OL$
z=Kjdt)9Lss@p@c`m$3*=UgW;aHlY@F#Z13g3*-Kmp-`EMmKcjOQBUtN)YhFw-MjNR
z4zJ=v?EEqBIJREm9<ppp-Od!kc=Bzq94^AncnY=P@?7m(xCT2hzn5{j`^bD7!-$t)
zZcM>&Jc+sR8tS2YY6h)vaTw~gibO5AG^WAwm=-Ic`c*-_6}3<o*Z_Tc8k<wlmL{VH
z+Gh>EK|NgOQ3L#py61OL1O12EnRF}N!<!BDnifHg6OU@&7&T8a>LKli`gJ^hCHt={
zTt-4yxC1rOx0n+zqXv9{dg?Q;asx-0#Zd#tVsWg6TF?O0!#fH!-utM9%(whHj3C~*
ziv2G@;XDaFT#r#J3|Z~AJ`y!hWz;~mQ3EwaZDCil4^|@{g4(gq@NL|U8n@^t?$%UC
zjZ+hKK@EKrbfxW3TQ(4ba2)E&r=YHAC91=x*cJC+35;Ij>Kma3Zi5=98<xi*sAp;|
zYMec&&yAy~3-NtVK@Zz))RhLVbpz!<#RX6uUd1{XkHI(<wV>Ikg)B!+{0&Cq6%59J
zb#6y9p)M#tYT{UAVLq=ug$yJ*qMn5wsE1=Lro$zu9a@E&U>B<Wanu6OpxXV4>G388
z;XPFQzfn67wBGfLKs_^sFq7W@vJ|w^>Zp5P8+kRoHn;`<#X#J&!F5bA_oF8K8uhtx
z7E5E6jqa1LI@Trbh}i<T1sF%XbCdggc#8T<+pGSm`=E$NZQWp0$N8u&`vtWF&rnws
zw%JWw5YsSlG1Lc5Nmi=`bi_!Ufx56ws9U%lv*I!Hd-P2pag%}u?(><uH=|JT3~ayz
zi%|=`o#Otj=<TiiSw{RVj>meR^Hoc`uW=vxzu>;}3Dk54|Hw#v^Ih&O%e>nyq%>wE
zUt>4JX4e2Dw8iZ)6DFhXabFC@VW=ybV)?aLocJ^I3Kk*Gu*dCK8O%pq565B;OvIb0
z9VxTdeaXe{<+AdUXhGs@9E2elzt7nab&uPk7Mg7NA(kI+@f35exx(CR?m>-n9JPSc
zmcQh)!v9dO;X{kF>~|d^Q1`4LYGLKf8mMO?$>L<QpE(NEZ;HhWEM9H#Hq?TA2d!}2
zJZ)Y?t@J0<#5c`HsGUfAz?loX5*I_YpNWNV0T#u**b;xkPFUkh_s8c_r_cM@5(N&r
zicT0y!=<Pd{(u_zs>Qc4hWLT`%2%#kO{_w`F6PIHsP}#a>H@y7_$%`wrvCoFLqQWg
zF#`^{I0LF<Rx__z47IhDEUsm7Q`AB`qprM<)z39oSbnp`-%B42Z&1*R|FnwihuyOf
ziQ4MdEUs^H7t{iVp%ysVoNf7K7H`4y)bGW#c*yd{EPozTzyGgT#VxCNjGFjA%ZDCu
zpJ@3}6ULzy+yK*KZ*!2<kF<EQIm7aE%;lE<^a$_2R<_M5cA7^}3pk7Vp!f~-dGG-B
z)IT*tkGciLptimOs^9CVx2cK6y(}J$nr|+u{lcT{zX~fYvB}(Seu=umlNO)B3dC0|
zpZ%EYp9ghIqEYS3qjstaYC*M8KRDW0JQRb8r}!uoqTt6$xE(dXUGotJ6F)-@7<Am#
z=P)C%2>F887we+hZAVRf$l{Br1ztz(;6u}w>4a+-g<4?+)Buew-`?W>=4jLcr&>JA
z{MhpA&Ce{q12yqsi_csAuP*QNZc)&Ro>+ryC*2k2LroN8acK-8e$DcUW|G+yt5V;_
z;<*??yco3;>&!it|28$|{$HV>Exw1T3qkEfHog$lu_T6I4KvAXZS~zO9$`+hyx-#0
z7N=Nz*gS)|_5S~?0{(-VF#9)d!osMnD~DQOO$@>$%QrK-pcXh7)ovVW=cZZyLvx9_
z!Q6p9O?a4s{N5_=VCsS_&VI^G5NVb~O%Q8woW%_=Gx=ti6_YJL5VgP&<|Na9iuYd?
zOReEXb1N<&zsut0-?{<XnLSYp7>ZeOw8hh{ezv&`bt^ZS$5G!cH*g^qIL-cR0lQAS
z0gsxeQ2Fzy34XQsPpkL7b6++=7(;zc)Pj1M1I*zVO5TT2I14pyiq-E|MK%&gQ1|Yl
zRs4c#c+=uX7C%F^%Xr59qf-tnO56pD<8)NN?dBo#JJbSyGH+Pk_q!#YSR&x8YnTPK
z@|>s%V=P}5HNk5ZCt`NuB+GY1weM{XMNK@`oNUfOo-v;{#}b=R1AlIQiQ3vz7C$xv
z&$(L?ifSK)nxM4B6)_)iP0M#e?M!#fh#y*hF-9=Iw~~Us&Gw^y3;u)}_+Qk(!ROt*
z%Z9qra;W-5)LZf<>Wbe+wI5=Rvit<pGc?`ui%|<%iK*}Zrxf_L>>V{vU}@rS%xBo1
zxa0-*2gFqK1SXOXxyaSxo7fHKpceWsYC&1QcMHyiT1Yf1UmksVC{&@)0h{4sOu<&z
z<OlZ}uEV#96E3+=$jzt$4x3+_XU$6(PyH{boho$MwJ(c`U$Z#zGW)NAlB}Ys*~uF8
zF$beo{ti~aX_nuQ8t@3}iqBg7o7Mk?(d3_6KJtoNNJ&)t@>jV3(<sy;(G0&s{XmHM
z(cPmGW+l`@<53gVF`J_XN=EJE5X;ZB{344##oW~IMvZgM;>$j3@DTO7rTNJ<$bovO
zB2ZUe*sO>-i4)DXs09o_O)$}1Z24`d1s^ldqZaThzJk76mPq%rYZzkYL4B|kvA7Xx
zLG3UDc0&!^&m3h=G3TN_*jAWZEq@5L;O~&v(&t^Lpe@gK)pf{W7Di223AF=ps4ths
zSP46zCYXbTaka%KQ47C<T44HL+}{CVs4I^#OJfN0dlfBF)2xeHVPmtiITW>!Ddqyy
zfNQOOGwRkHMBR$-%?D<tUtPWsYGKteJ@b3@DCkO?m~G9jn2UTrOpB9H9jBsxGtRSk
zH)_GhPz$__TEHDM-8Hw+{HXqg&2pIfzyGO0K?Br6ZE0(Zd!agvHm92Nun75;7N0=%
zzld7EZHu2;eU|HPoCvHzeNoiT^|;RdYl40xv;(88;UsI|#|ZKZE#7AJd(7kJ1@jte
z;QQv^=5sUs4Y$zD7)`qZH`sqIAc2HzVhuW=u4I74<E(x*YHOESyc5HSkD%ILvijSo
zXCd%6H|{H_elZruq1rd_S)x7aN_&};Fg@{dt6ytwv;0AekDC`zx8Rz^kIlgUxrKzH
z>SItBS_Na!SDQk93jHt&XP{QL84KZl)IzSKZqXg{k?GxZ`HZN6bD$=QLiMX)`Kp+K
zxDEzm6PNdSZ7FC0JzT<@jOsWWHPA=+CT_x_7;uZfcCa`GV*}L0EzK^d{sXLjxW(g9
zw_u9J%Q3&+|Fsk}(b3cd_Yk!MPf!D8yzLA{O_bZ>!WNe_V^RHTVOeZp@q6Zc)B@I^
z#yx-&^!^{Epn;R_I9sC{bVFTXAJo9ZP@jC0F$DLb7JdSY<BzBbf`51SydY|v*HG<i
zSe#@w#nkt|jV0bPdzk%D9fz6|%n!`P<~r0uzOeW>>TCJ}7Q>J~+_z~ZGu}-4gZ<A)
zgO((8g~_NZ9*Bi;l*P-<4dyn~mF>rTcm%c3>*fRVIci}ccU^rXDlTbpjl1l>CQc%u
z0oz$cXS2UK+MJ5o;&~QtMh&<J6YyKh=e*~}Er?oJIg4wc=4pf)r-hF~4+{M(anZbw
z+KG(!U56Z~fg;SJsEI3DT*qu~CY$}tQK<2zpcde_yl)|ebR<4O-HMG^61Q7}>!_7J
zusG8LH$ZMP64O#&#Ny(piOO1B)vRgOMO{c^<P*~8wWknBVvtn~H{ZqV<Ucf5p%${;
zJdGOYmiZX769@k33`bpQaf{2M+9#mKX_6Xq|9e@3VW@wpoNDne=0oJ0)XVUf8~6@t
zpyy`DLl@^Ui<srjIJ1G-2D8w=JEs2ce}+=fN+(%^>6n*zq2<4@{9f~fdC|O%>i@vv
zf6Vlc+(&vCs=gxX6SNxY6SOP(RCteqwq(8e6>0%jP*?f{wY5Qyov)w<Duvmw1x8|b
z)JOSbt6z;8|CGfKFqSytZ~mJAHvikc|JRe4OJX~=#76(P1$|=fN7a9iny~*9_enSo
zOQ|2`#2Z)w|HVOA^r`z+U4**8?WhYmjal*9Q|^B*3V)HPgPHzye^NC=J;e)ATelLm
z6YH@bZpTAd^cnw|2LHgkIQc*KAE8%bP2zK?E6x4f{e96FlZg*vYb@gP0#g5nKx45g
ziA$&zh6e<s{)fZj7)o5jY=T-)XVijvnZwM9RzC~%TF*zlo*!F&IqEfEYq4)D1x>gM
zN8&e_3G4D-mNZdw)K0WByP?|mxB3Z|pNiVj+2%^r0=J^tAF%kW)n7$+%;(*=23gVu
zq&_@RsE%={d)fdau(RcT=KJOXb2aK=OR@O8`Kx))d}d}0)WW#`;S}_66h}?`MrsA0
zP^f34v*kyclQH#5Q9HBJ+=Ow&+fh6B4>m<Fo!fzCsC;*`FQ)$c{}5|19yRbB%z&#<
z6Kq1=%k8MAe=m-~Q}`M-Oz##x*_@3UXBk$(EvQ>?2Q}Vvs}Bwe@O)~Rhk~}c7%HxT
zYS_r))@DzPB|ieSQz_<t)NA-Ps{d2eZ^=v<T)R@Jd==C@^(^j`A;6bf(Vv7S9E)1%
zRMhwSV$?*tEPoU=&?VGX-bVF%fO^XRwb%=G^%+t9L(Tk_FJYDo_PK_!mWV?wpf--c
zHpnC5okdO1ETfyS6>8vQ)I$2<t2h)3<0q&OqOY+P{)7A$@!rf7;QlLmNI>fUUSO(^
zf(AZ<rSSynX@7#+(p;HcoPb(bC)C7)%(2L4i8mczmstW*{~_Zfwjqwn>J~f-)qfJI
z{{o8>S5wd@*bdZIzR7>84#Re+t?rKjsH1TjeqwQs;CyjZraaGorD}Mop_H~+dZ=|-
zi*v~9|3f&@>Q-Z0e^j-IfE)hm)uMf$Qs0(b71XhqwihYC$G#LJu4-fD)jn~|;T%hO
zFzPkoo_qW_@m{z7U8pP0*_1e$ypAhY=Qp3x=Wp`m(s=%#s^#mNpZ24uyJT~9r!FhG
z7sor)g>&ZO{D(GYF(2Ng!DPzwIX@?E#5sa~*@$m*{$vCE4{Q40svgm`E7@dPJt8xX
zat~U6fDbu4kV}I#$YsZ8oKI-GfH)Gj66?^bp>L0K7Qc#Jh)dCC6lU~atsdTdoz<Qt
zo5Bc-sVPeN<>LfFCu^tt7o1&b`{JlgT_@sP^oztX{synd^yx`9(wdB*rp!yDE_rD*
zHAzpeUF7t+p`$W!DdLTkchD~vacAO%s3Qx$_R<&={a0U)C>%>>0ku=9{hsnFe3;sv
zk2m6fIY0A9)d=s}ikb#QYpBhPal|@O99~7@h0J?__#?`P@Jrea=F~C6;U!zYEyN8d
zKcfCW&Z3l?_!rmUxux_0wP~;zBTl!Tn`|V7$2r3}D{=lszM}0^XW}*V)A5Qqk-E9W
z6|MhAl-p5WiY2Vgc+_h>AT59KowmW!(r7v73Mwm;>&2=6cm8uUtVzC{zh_)z&ZU%I
z9Isl>wf@C%(E)}12jU`q)9Jyln$+U}|9675=S#+Wle#}JN~7T>VjcfcP9e9KGM^Kv
z$1Ljpw!Ts1x{{qi?ssy(Q?6rmt~LL#OkETGBG$*#9nJ_k&Gz?+FO!&#syu3ELl2{C
zP0F9WG{kJm-;q0Hxw6=hemd4rzUjXjACWU3nRG-OIV(~#R%L%^%`o3UYT6U!W{mZz
zy*#e~aV+_c#6gsGbSGYmEjSlZE>HV-t5ba;%HzoAr#y_h^PC%qb@)*q(w~y+M!7la
zNYQVxEOg99a=m|J&FH8`)+L#20OiHF6%WxxAIn?(_iM&<9ZW{w7Tc)(otk3A)hVx_
zT#s@;n}A~K5lvi`pcQRCLH=?{{b{4hi=4g5)uV1K?S8}zoPGSG-v}>TkQ)7l&_UA6
zO#Jdu+yedadw>Q{{D<C%%(qHSIkqs~KFWDGbGwvR-5-z;mN<oszUN*XAJVcNW6$9n
zMsghSBHW34X`5j4PQt<Ds#5pZ-#Q^W-FMW!<{y_3mN|*K+BV=y|FVRz;3;HIQoqB$
zCm}N35lU74R};e1btK>1|12Roz8bkMoEgY`gF4nxZp?X$_zq_sa_?}iB&RQR9buG%
zIj{QPN({?0oK`;0*QoggUmU0X(-X`4-Y4@eZR=t>s%o?T->g+P%E6RJknc+y9orpV
zCGtN~?oON6u_X07$^DOW7Uzqj3i<Y&*U0s^JpcTcdb9}e{55K&3%+dmzWxTaqBDO%
zRF+XM;Y|PNT9Hwu>HijIOR|Gd$4Kj=@>BnwTH!6)kXc8IWt?XyH^4?OwNlH^>HQ=5
zBAgRA_fsE-Z*l4<ghOdFoKwF<cs+{Ou2gIrVOy#?(tNxP*@s-Lbt{YoXuQNfrFL|&
z52^W+s6H)g;3R6NQGS=RpGLy6_>ccw?dZf~MB{1k73V$5FOEGFh7i}K<uuL#l!M59
zg#1;KdQ7G4r<}=Oy-sAYw~2DovLDVRTgx@_(i3+k-cQ_%a&P~;bt0?RqO^cBlCuD{
zB~V94%0E-SN4XTEy~^2wvjh3H*5*V1)jHwD7FwiUZ&9vAEBz{4M)_OLS(IPF6aJ{W
zVeJo7szZy}WZN^=Do!0sumW{2j!!7pr=5-*)J>%PE4d}aneb!cI^^St$8+|e+|oa*
zZe-LVYIS@}W+|=CTilfL1oAojr|X8deqh-$WH(T5&e@XM_c%L~>qGA(%7r<566+WA
zXXJWO*3sVK?V;c2R-RAY8~*ru;l<KY%1rB`R`Y@+S|1~Sl~aG>-uI8I7vXz{)-{Q0
zkX_HIV>&H+VG(RX{b<f^#K)<hM|lY4H*hlNaO*?L`<V9K)#s&L4dQ|pe@B~6luMJ-
zktZ!*{EtYSB>0@<Z<NPU9%voLU?7tuU_2($<|y^q{Y~nJ=Q&8!n)4LrZdxp(#SNV6
zA6Gx3aDSqgj}Ekor?wJj1?n0Sf8{?=KdjGYO4De1nDdf#sX{9q)o3}I`WFX(Hh43L
z7g_yuEJT|q&b^eIah9hXM~48~4dg7&siPT|@y92X@C~6wW0y?*zpaUvQEG{!U&==i
z>$uIRA(UUY_<fvDt}CaGL5$pkvm0j;xf|rB;Mc@|a$cjHNS~f~l25$bNug~fk^h5p
z2sxjP+lKN?%FQ^BQr6MN>MG$l;spBWm`Qy#%xLjt;?=Zik;Z?uVJ=^^bvtg=>N1t{
zW6rr&ch9C6Y4JYlhFLirf1vMr&e|{PX`g6)J|Oo2<rx;Qqwg2w7ITi&&x}zN@>3a#
zeW-lSKr5|rPJeL2h<riRtfI!pIggq%ScKfSxY{4zutuKk^x4hXgG^z(z}bNo%l!))
zmdU<?=oB?Ns&mHa%ESHl8U_U~CoDk23I2daVNpkExS2@DY+J&8jIrFC{)&wvn{T&h
zq_wz9FCFzc%Tpd>^~#mg{~>-NIlkn4k2b|PZ&Gf+`7Pu8l(M!_^~x!KOo}WSRIWhT
U%2mpiOUaS4u|mqx-!2sWKMaQfxc~qF

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 9c40a44b2..dd120a909 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-22 17:12+0800\n"
+"POT-Creation-Date: 2019-03-27 10:57+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -2434,35 +2434,35 @@ msgstr "任务列表"
 msgid "Go"
 msgstr ""
 
-#: ops/templates/ops/command_execution_create.html:144
+#: ops/templates/ops/command_execution_create.html:148
 msgid "Selected assets"
 msgstr "已选择资产"
 
-#: ops/templates/ops/command_execution_create.html:147
+#: ops/templates/ops/command_execution_create.html:151
 msgid "In total"
 msgstr "总共"
 
-#: ops/templates/ops/command_execution_create.html:182
+#: ops/templates/ops/command_execution_create.html:186
 msgid ""
 "Select the left asset, select the running system user, execute command in "
 "batch"
 msgstr "选择左侧资产, 选择运行的系统用户，批量执行命令"
 
-#: ops/templates/ops/command_execution_create.html:200
+#: ops/templates/ops/command_execution_create.html:204
 msgid "Unselected assets"
 msgstr "没有选中资产"
 
-#: ops/templates/ops/command_execution_create.html:204
+#: ops/templates/ops/command_execution_create.html:208
 msgid "No input command"
 msgstr "没有输入命令"
 
-#: ops/templates/ops/command_execution_create.html:208
+#: ops/templates/ops/command_execution_create.html:212
 msgid "No system user was selected"
 msgstr "没有选择系统用户"
 
-#: ops/templates/ops/command_execution_create.html:253
+#: ops/templates/ops/command_execution_create.html:257
 msgid "Pending"
-msgstr ""
+msgstr "等待"
 
 #: ops/templates/ops/command_execution_list.html:64
 msgid "Finished"
@@ -2521,7 +2521,7 @@ msgstr "更新任务内容: {}"
 
 #: ops/views/adhoc.py:44 ops/views/adhoc.py:69 ops/views/adhoc.py:82
 #: ops/views/adhoc.py:95 ops/views/adhoc.py:108 ops/views/adhoc.py:121
-#: ops/views/adhoc.py:134 ops/views/command.py:43 ops/views/command.py:67
+#: ops/views/adhoc.py:134 ops/views/command.py:44 ops/views/command.py:68
 msgid "Ops"
 msgstr "作业中心"
 
@@ -2533,11 +2533,11 @@ msgstr "任务列表"
 msgid "Task run history"
 msgstr "执行历史"
 
-#: ops/views/command.py:44
+#: ops/views/command.py:45
 msgid "Command execution list"
 msgstr "命令执行列表"
 
-#: ops/views/command.py:68 templates/_nav_user.html:9
+#: ops/views/command.py:69 templates/_nav_user.html:9
 msgid "Command execution"
 msgstr "命令执行"
 
diff --git a/apps/ops/tasks.py b/apps/ops/tasks.py
index 9de1d0437..aef8ea055 100644
--- a/apps/ops/tasks.py
+++ b/apps/ops/tasks.py
@@ -4,6 +4,7 @@ import subprocess
 
 from django.conf import settings
 from celery import shared_task, subtask
+from celery.exceptions import SoftTimeLimitExceeded
 from django.utils import timezone
 
 from common.utils import get_logger, get_object_or_none
@@ -38,11 +39,14 @@ def run_ansible_task(tid, callback=None, **kwargs):
         logger.error("No task found")
 
 
-@shared_task
+@shared_task(soft_time_limit=60)
 def run_command_execution(cid, **kwargs):
     execution = get_object_or_none(CommandExecution, id=cid)
     if execution:
-        execution.run()
+        try:
+            execution.run()
+        except SoftTimeLimitExceeded:
+            print("HLLL")
     else:
         logger.error("Not found the execution id: {}".format(cid))
 
diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html
index 219fc218d..8352d1607 100644
--- a/apps/ops/templates/ops/command_execution_create.html
+++ b/apps/ops/templates/ops/command_execution_create.html
@@ -82,6 +82,7 @@
 <script>
 var zTree, show = 0;
 var systemUserId = null;
+var treeUrl = "{% url 'api-perms:my-nodes-assets-as-tree' %}?cache_policy=1";
 
 function initTree() {
     var setting = {
@@ -110,14 +111,17 @@ function initTree() {
             onCheck: onCheck
         }
     };
-    var url = "{% url 'api-perms:my-nodes-assets-as-tree' %}?cache_policy=1";
     if (systemUserId) {
-        url += '&system_user=' + systemUserId
+        url = treeUrl + '&system_user=' + systemUserId
     }
 
     $.get(url, function(data, status){
         $.fn.zTree.init($("#assetTree"), setting, data);
         zTree = $.fn.zTree.getZTreeObj("assetTree");
+        rootNodeAddDom(zTree, function () {
+            treeUrl = treeUrl.replace('cache_policy=1', 'cache_policy=2');
+            initTree();
+        });
     });
 }
 
@@ -250,7 +254,8 @@ function execute() {
         method: 'POST',
         flash_message: false,
         success: function (resp) {
-            term.write("{% trans 'Pending' %}" + "...\r\n");
+            var msg = "{% trans 'Pending' %}";
+            term.write(msg + "...\r\n");
             log_url = resp.log_url;
             int = setInterval(function () {
                 writeExecutionOutput()
diff --git a/apps/ops/views/command.py b/apps/ops/views/command.py
index 1c495e44a..3846aa766 100644
--- a/apps/ops/views/command.py
+++ b/apps/ops/views/command.py
@@ -5,6 +5,7 @@ from django.utils.translation import ugettext as _
 from django.conf import settings
 from django.views.generic import ListView, TemplateView
 
+from common.permissions import AdminUserRequiredMixin, LoginRequiredMixin
 from common.mixins import DatetimeSearchMixin
 from ..models import CommandExecution
 from ..forms import CommandExecutionForm
@@ -15,7 +16,7 @@ __all__ = [
 ]
 
 
-class CommandExecutionListView(DatetimeSearchMixin, ListView):
+class CommandExecutionListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView):
     template_name = 'ops/command_execution_list.html'
     model = CommandExecution
     paginate_by = settings.DISPLAY_PER_PAGE
@@ -50,7 +51,7 @@ class CommandExecutionListView(DatetimeSearchMixin, ListView):
         return super().get_context_data(**kwargs)
 
 
-class CommandExecutionStartView(TemplateView):
+class CommandExecutionStartView(LoginRequiredMixin, TemplateView):
     template_name = 'ops/command_execution_create.html'
     form_class = CommandExecutionForm
 
diff --git a/apps/perms/utils.py b/apps/perms/utils.py
index cc13c3cfc..4243b17bd 100644
--- a/apps/perms/utils.py
+++ b/apps/perms/utils.py
@@ -104,8 +104,8 @@ class AssetPermissionUtil:
         "SystemUser": get_node_permissions,
     }
 
-    CACHE_KEY = '_ASSET_PERM_CACHE_{obj_id}_{filter_id}_{resource}'
-    CACHE_META_KEY = '_ASSET_PERM_META_KEY_{obj_id}_{filter_id}'
+    CACHE_KEY_PREFIX = '_ASSET_PERM_CACHE_'
+    CACHE_META_KEY_PREFIX = '_ASSET_PERM_META_KEY_'
     CACHE_TIME = settings.ASSETS_PERM_CACHE_TIME
     CACHE_POLICY_MAP = (('0', 'never'), ('1', 'using'), ('2', 'refresh'))
 
@@ -115,7 +115,7 @@ class AssetPermissionUtil:
         self._permissions = None
         self._permissions_id = None  # 标记_permission的唯一值
         self._assets = None
-        self._filter_id = ''  # 当通过filter更改 permission是标记
+        self._filter_id = 'None'  # 当通过filter更改 permission是标记
         self.cache_policy = cache_policy
 
     @classmethod
@@ -195,7 +195,8 @@ class AssetPermissionUtil:
         return self._assets
 
     def get_cache_key(self, resource):
-        return self.CACHE_KEY.format(
+        cache_key = self.CACHE_KEY_PREFIX + '{obj_id}_{filter_id}_{resource}'
+        return cache_key.format(
             obj_id=self.obj_id, filter_id=self._filter_id,
             resource=resource
         )
@@ -281,7 +282,8 @@ class AssetPermissionUtil:
             return self.get_system_user_without_cache()
 
     def get_meta_cache_key(self):
-        key = self.CACHE_META_KEY.format(
+        cache_key = self.CACHE_META_KEY_PREFIX + '{obj_id}_{filter_id}'
+        key = cache_key.format(
             obj_id=str(self.object.id), filter_id=self._filter_id
         )
         return key
@@ -301,8 +303,9 @@ class AssetPermissionUtil:
         cache.set(key, meta, self.CACHE_TIME)
 
     def expire_cache_meta(self):
-        key = self.get_meta_cache_key()
-        cache.delete(key)
+        cache_key = self.CACHE_META_KEY_PREFIX + '{obj_id}_*'
+        key = cache_key.format(obj_id=str(self.object.id))
+        cache.delete_pattern(key)
 
     def update_cache(self):
         assets = self.get_assets_without_cache()
@@ -319,17 +322,19 @@ class AssetPermissionUtil:
         缓存，以免造成不统一的情况
         :return:
         """
-        key = self.CACHE_KEY.format(str(self.object.id), '*')
+        cache_key = self.CACHE_KEY_PREFIX + '{obj_id}_*'
+        key = cache_key.format(obj_id='*')
         cache.delete_pattern(key)
         self.expire_cache_meta()
 
-    def expire_all_cache_meta(self):
-        key = self.CACHE_META_KEY.format('*')
+    @classmethod
+    def expire_all_cache_meta(cls):
+        key = cls.CACHE_META_KEY_PREFIX + '*'
         cache.delete_pattern(key)
 
     @classmethod
     def expire_all_cache(cls):
-        key = cls.CACHE_KEY.format('*', '*')
+        key = cls.CACHE_KEY_PREFIX + '*'
         cache.delete_pattern(key)