From c36533c0e7cd2fe86ed24940b8d225d96b2b9788 Mon Sep 17 00:00:00 2001
From: "Roger.Chen" <Roger.Chen@fanruan.com>
Date: Fri, 5 Feb 2021 16:36:33 +0800
Subject: [PATCH] =?UTF-8?q?DEC-17168=20fix:=20=E6=9B=BF=E6=8D=A2=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8Bredis=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87,=E4=B9=8B=E5=89=8D=E9=82=A3=E6=A0=B7=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=98=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                    |   4 ++--
 .../plugin/db/redis/RedisConnectionImpl.java  |   2 +-
 .../com/fr/plugin/db/redis/images/redis.jpg   | Bin 0 -> 6671 bytes
 .../com/fr/plugin/db/redis/images/redis.png   | Bin 6671 -> 1094 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/com/fr/plugin/db/redis/images/redis.jpg

diff --git a/plugin.xml b/plugin.xml
index 6d5ac2f..dc19037 100755
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,13 +3,13 @@
     <id>com.fr.solution.plugin.db.redis.v10</id>
     <name><![CDATA[Redis数据集]]></name>
     <active>yes</active>
-    <version>7.4.2</version>
+    <version>7.4.3</version>
     <env-version>10.0</env-version>
     <jartime>2020-01-20</jartime>
     <vendor>richie</vendor>
     <description><![CDATA[可以连接Redis数据库，支持哈希表、列表、集合以及有序集合]]></description>
     <change-notes><![CDATA[
-        [2021-2-4]更换redis.png图片。<br/>
+        [2021-2-4]更换平台redis图片。<br/>
         [2020-12-29]解决平台数据集参数公式识别错误。<br/>
         [2020-11-16]修复保存数据连接后平台测试连接报错的问题。<br/>
         [2020-10-28]支持单一主机的集群模式连接选项。<br/>
diff --git a/src/main/java/com/fr/plugin/db/redis/RedisConnectionImpl.java b/src/main/java/com/fr/plugin/db/redis/RedisConnectionImpl.java
index a28166d..bcf25bd 100755
--- a/src/main/java/com/fr/plugin/db/redis/RedisConnectionImpl.java
+++ b/src/main/java/com/fr/plugin/db/redis/RedisConnectionImpl.java
@@ -20,7 +20,7 @@ public class RedisConnectionImpl extends AbstractConnectionProvider {
 
     @Override
     public String iconPathForConnection() {
-        return "/com/fr/plugin/db/redis/images/redis.png";
+        return "/com/fr/plugin/db/redis/images/redis.jpg";
     }
 
     @Override
diff --git a/src/main/resources/com/fr/plugin/db/redis/images/redis.jpg b/src/main/resources/com/fr/plugin/db/redis/images/redis.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d30fb19fcaab5c13b35665d6f05980a575164aaf
GIT binary patch
literal 6671
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/com/fr/plugin/db/redis/images/redis.png b/src/main/resources/com/fr/plugin/db/redis/images/redis.png
index d30fb19fcaab5c13b35665d6f05980a575164aaf..16cc883ec45b9d1dad99eec50f94200f9b359a6d 100644
GIT binary patch
literal 1094
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pn}NEkcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5
z!d3~a!V1U+3F|8<fR&VF+bTu)1}He^7o{qg>Y3;nDA{o-C@9zzrKDK}xwt{K19`Se
z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F
z7L;V>=P7{9O-#x!EwNQn0$BtH5O<bjrXg&~D~5Ut=s|sujJ~0sfj-=9pjI1@sFi<F
zW-8ETkok6oHei(~Vo-Z*^g)&*IR@fWuqe>0c3d|4@L;p!@;Rg)$-uzW=IP=XVj;LR
z*w<g!QKBv_-Rkd>Ev`-i9lEnJ3|yEc9ywlWW_RB4iQPuxf7AARHZv>CDvUoaR=1t>
z;Naw>p3aL$KBNZdh<HV7?7sW%%sGqHg=|+Q=WjZ>$NG28p7Upz=3Y{X*Vy1!owabQ
z+KK1?Z>S$EPZM@wf8E3?Qq_37kf%*UYTuE2cjnz(J@1iC4zB^jd9i0ky;VQ|{Yd!r
z>`d>;dlfoDUt7|1r*8k-JAdi1?$)F7tJy!D{I%Mh-=Xg)gPC>omM+&H@~6(-c(F9Q
zJfdFYHB-QB(<@q~Ia9o@g)N<D+3_uPN`Zd)`8(A)Z?5#UMt(eT{k!dP@0~otHw7hM
zJuj(_PuTZ`SO2<Mqpbf?(}f`$Wl!I;kTRXIPuQ!z$vvV&d5+Jd5P9W14`o^Jgc(8>
ziFusY+k%wT7R4@f*nHOcg5rv*Y3E*wT@$;nm^r^ySGizrZ9(SZcUKnrPGeiZku7V<
zk>T^m@n#wKM}x!Df2QxSw(Ggtx_n2SYWu~{mMI-A=?N_oCxfpRGPo(W9Jmo8ciDKm
zfyo8tt9M(UwlQ@tKco20X=_YF`P>CRd>tffmL9B-xH&O!iI7a{efQgoY*sXF5?E8f
z^DpnGJj=7v-<t%J93@oeX9xHx^kkp4xbS6xi?GM{Keo(^nN!<J=9b-BWxKx8=e_oi
zmV=vm#GSUr-!#p6%k}6*%ZwDUuUlBF)YNCGXw9DGog28)bV)|Y(vOLL4WGkaUJh-}
zn=E7XQb0u`bH?tbC#{_x7S(;arqwrRf7kBeYVVx4P@r2?S2w!nMA+R1+t2%DlKf>(
ze>r@8^5kUk<(rsK=B&(Ge!ni}p?3WAC9&(TYzaD@cX_V9y?%`u%l}YymwLv%eSFie
SIiFk$%G{o=elF{r5}E)k0l8cN

literal 6671
zcmbtY2{@GPyMOI#$(G#|AxnfT*{1X%BvDK#^C859e8|$6DT)wNDqEHh$tPRZi7;Xq
zDr6l?ma%2cjCC;c&YAk3?>ql<&Udcsf6n>Md%xFxz0dnBzj=SpbKlRy7-mcXhpfyk
z%>fn`065S50Sppw#w^Uo3jl0v02KfLxB-?}AAp_dF<${BnFau?zq9`Jg#0_(Uw-wE
zLdGhff9YmGa6r(_fZIp3)lUNYrj|DBKU!eor?2qSJv1QmcmxAfvM=7_Nn4?sq8QD9
zAU9AAkl9$|09HX3HbE8!9)K`==3x1WpVgQ*7FITP4o)s^9$r4?3pIxTRu(okR(3WH
zjvw8yL^8_(c0mrIqnc+qh3(w9<N`&s?mx}tmN%{VAZp)BKBn#dTNDrPVKH$DNd-lv
z<H{<hbaeIfPaB;3#mwB|yrtFUD-MpZt4_`yH$1((Z~FKK1&7=T4GWKme(*3R_EB7X
z^0VhJQc}~>GxG9Z6}&F|qv%a#Rdr1*_FY|lODn#uozT(wv9Et%aELfOGD@1BnVp;e
zwy?NFS>M>)+TNk=?)~7!0<isq7W4iOX8(nkAd?p>J3AXY*AHGStf4=M3$k+@)#Ma9
zYscjlC@iOSpIgNAX>P>_9(iqhvZ(uSy}XByogyhveo*_#>|Y}m^?zda7qS1~H3pnx
zis=VfnHL)?EAvyaF~QEHzyt>;$4_wnJGg#=`v-Xb0)yGe&lXr&*_js)CkN+WW&g6n
z7-z~-fH4a2v#~J6#3l$p0T4W%7Z3bjjq&CGS-<!1>Nk1O%b_>*(O!`Il09w2TCwD-
zDkYlQx6D%<dBpF4qF>D~>WkJ&2^b8@TV=fW|1_B9UU6!n?}cw!Z@gbqr+=iXTE$r@
z8$)(82``U(Tt$jazfvFW-$Hdx^7*?G+9ynUSIa#1znI-tSK#_W;N0%1Ri#p?3}F8*
z>dRz}e~~Kk7ouWC)w%n5PE{_WEoT;b+0vy3U#Zz%I@4UPNY&72c^ME_??xT;2?-&U
z;6_ur@W0&<7@s9u3GYO`&|ff%Y|z&j=?}tpF7~OymuFGv%b3Vg2U|W4@1cvI_I7gy
z1LB}lm6H{RA9RT(6&5W$Zse$W5HIkh+g)@v6-vIAGxGh?BpE}sz^Bei^P2%Z^bOVN
z60my*Lbe@ye_WpGQV{0ReT%~-%}q~2_Vvt(9OOD;4N>zx!9sU}yDzuGo3GO4?)eUf
zj!uV5EQUeYKe`Qw(e`Dm2PZz-4vwu`^!Deb4ZuS38s*VlIhmCV;6tDZr1+^oD@3UN
zj>p_%@Pz~eh+0C*SK1o7Qqj{=$2UHmjs+stVY|c$OhCbe(>OJ{{jhUWVaTm6gpa2I
zhrN^!;`vo~yBw1Jt~?jO*3*@({%*h_OI>YE_J}r^CHZ}4QBobsiz)vV_l*EvU;rKc
z`-UeO!0#B^Q*`=tZ4UW%`HK93-fD{e(5WGK12WBvFkqn>(AT&@TB98v19^%lLUw+B
z6iFFHQ!dHU(yqK&O5z$Ml>uO2c(hPYb8U<xHO_;yb%rMZ+lF8OHJr92ctTEXVh&B%
z8$9Ia)^Nhl4U!<l<J?xwDacvJmxj+p2Y0vtv{zg0s>KIvSzN7nGY9t#!B|<9*B-G6
zFN=9x>I3Pv-<3#M0wfwLzQS2Z&TosbeKckCy}$fu9bv#6kHN!=h`ZX<AUr5fzEgM@
zN4jqM&9do1jCF!#HjiDbY1sooj0e0=fF|?}<cr<EP>%080CqC~Sx;H*FCnVKC2~Xl
zLG)bzjkihSqpr^q30bXS*Rt^Zu;QdC=iY=A*=s|KRYs3-cuAq;7!@OI-+nP}`7=1U
z@Y?K1iq4COlUy5x#1=^ILlL_(9RFkxM&Ey*T&f$PAaB=H@uW1W1*KO};b~r7>(V~{
zrSv_|Rn$=%)Kl2J1x<A4>Oe4hSg##Zc;4NIbY41XQU1+a+S#_d4eAB-g4o%JjrPe1
zle-CZ(8>yvURR@MxI$GZ2Kpev6C3AuVv6XOH|TeUH(A$OW$#$WxiVvIj4vG^TdY`4
z^*nl7d^4jBd?pW=b_mUxWUkyoDdIH117Y$ml9{2|TtkYz-z~ZLHhv+D+n`2~JcA72
zmM#C-S*<W{3yNRm{f*{!o?(Gs&-9SsUo$OQue>=s6g;>;u0gQHGXNv~&;(VtRU264
z3Imv$B%hoFd1NRT*VzI|7?DMy(jUUdo?z!{2%xd60L2C55#9G5*QxpTu)#q#<5nwh
zYfHlY>p^aPC;1Otx#go8{HVbuWAfG;!VKo2!CahOCzifWS#0wTi`@pPHVXM|Wj9TZ
z_UAxOCU+)5t!TbT!=x83<_Ur8)i}i-qEDbh(S}Mzz|iC@`n0S9{T_2jxw3qwsZik>
z@%#&9qjMqRvJH{dyu11BxGLhRQsH}u6!L-|d*n<=nT_TQF{JewrX6>?$pAH+Q`O$c
zp0gP7_+Zd_r`OCLY{s^|=W!0_mZc&>#&oeN6P^DSbZ;W?eGqpt-*U0-QeZaPMvYF_
zxO2z`Ik|+qTS`;tSM%~go|}o(G6xj}jJ`1dnYhj}-VJlATjA|Jde<VP)yJzDLKRsP
z1EUbyZ74%BvJbZ%tVdKb&T9+5-u=FKyiU?J4qA2LPW+~Pi#YenS6unA+a{WyzfsIA
z$h46Km~;7qBQsWg6QuW+k;=EBtIyrI=JAn;<#MW$cT7l6JQ@pa)!-ksdPG^ivvU^U
zj*}_cnDpgmd6G5-`&K?eyB^v$)9Tgq^fC4uoH>I(7?hPGkM7^1of_PX8~4Xy{XDdU
zJDsFFFu9I$+1{xwNxaxW(#KuT;!U(xWoApr2Csnd<@6we*;13m-ovrnB=*M)fcO3`
zZ^rL6?%Ta}OIIL$h2_(VXe4vCoM(+c{`;RM!07***|JUq`5+8HQEIxE0bGM_`VyBM
zP)^K&-N4PZ&|H|>{PFAy8AD6FJvoB`pJUQzY<GpHam!yBz-9^>0_X6ToY+?6Vi%03
zQ|YNl&k%2E&Eh9#*kK#{WaRx2u>sg%J(ebtKZRWhrTC7KFzwa{Y~+%=Css99Jggt^
zX{p|$_`}3|>@tZv+2Kir7ZV=BZfp)P06nd1*<tCUnf^nCTQyTSajEw@dPg9sneqA4
zS?JatuSwsk7=LJz4)il@cJhM;RTW1Q&L<qc{oyqd)?4C#%<hqnZgR`Dnb%{_F@?y$
zHP_W*)G)4c9#?2ouY||&kE<IH-i$(ec50{xq?4XkBofSmHtPpe2nUP0)hA*xU|)S<
z)T<aTkWi@>!~oP_G*z<3%zVM`7J-Ii!!87D;I4-qU3CjPql9Ttp0VcHf^hq$)R$JK
zoICNV^VHo~hp!JFGeLnTz@_FV19ih^iEB<?a#t4qFk3){BsQNtPgTXcs#XtNn(%qg
zfAQjw1L0is*l5EW2H=<tlMfXcOUG4&6!-9bMdp9@DedvHI4w`sX$kAO{Jy_LG?)Qw
z?Fex{*%SVHcSuLuss3Wn-GHSCePjl2<%7ff@QTtPbbufOIRD}@bmCWNR;0&1XAe6A
zsMTwAd^kv;9XkvUj%ENSEDDeUVy&&Wo9-0dSylaQES!EZ2=2*LfH6(xVC+7EcB(Nd
zG?0$-;(c=Zb97%5Tn|r7Ib8hw)LbfDF*4gSrqx2iBBfyTc|>?V{gN63nCaHo5!-dh
zDD`HBfI##++{Y3kdE+a{)amiOC;xc?ANV^-eggT9pQlGPT*sXMDM&xmRpxL!4?=&<
z5rf?PhaOY^(qqO9bXUavPd!TKaL<kf9^y(;ofV*}z+0CmMNoaUT5Ts|biM>PqwEPM
z5W*2jc-Rn}M@mc(CEAA~qPdVx6!`YzLt&<$R{PK9-Moi?e7~D+z}D=pO_c=eDW;8A
z-P~5Nb+pqYHRXoj#@eAxsBkr8<dan+oSJ^!_K30RL%Y3b*QbTxC-lK5{u!g;+RH~F
zd)%UX7oeVyL|3r~CUsM*?ju0=d}UgZY;M#OizdXu<>rj6`zI%yY}i;jl9ev+m7)$+
zyo;sS<a}9=kwI!&Y;x=?fXz_eRR-XOi^Ux>GXBHY`4?=qbi72VysB~8Y_^ZlK+*-R
z^K+d~Vp_A$ca%RsokFrv1z#^+b`HyLmt4)YKdZZE)<^&!-W5fgqAR^JDwu!dX%m^T
zw;yZ-E#wP(6j1yqqT@2;(f5jxm%GGOSE*?g_qU=V^J`+B*rjwDg;4Ebamq^Bsd$*?
zO|L+4(-g=d*qAjF@i2_T(CkodeZ8=+0n$1Ap3BFhqwFv}g&kd6hi0~-@*W!t=Z5MO
zRmkC%-Kev27t&_S%fg^B2T-Y~!9JD(Bs2lc&3MWHI+v)im#{H&7xa!-9$gZ@fvVX=
z@F<^4x1JbU9lIW}k`z8ox|kOo`~Jq}Vn}JuLXa+~My7Xg_&ZoKL!dGpv7#}odbRI6
zbERScF)2e>o@252!@qEx))&H9QQ;1~NIvNT?-zcP@65r>>82)T)^}$Cl&YoIpd`l^
z^-O}J;Z@>l1`;qM51l!$;rL0%Vu{~qTFbM0vQ0J*Tj~CfXFfMBd~YCLrrR@n_&ae^
z<iCQu|6SXIf2ZwMkncne^;eA8Odo_US+kb|Pl1q~0(MVg#3GL{fZk&Gxfb}kPAfVI
zx@T{Kc+3E1?cy0gIdcK(bE5guR2aZ@9yS@(?_+nl%NYQ|DQ&9$W<3i5y~}kD&O=j@
zDwFFGU4tJ+iJYatwsZE4B1*dx!#NZ4)L^>J$t-VUPpfo{TX?{SO^$7-h>XGpz(eFd
z&9M0Ri=(K*O%mC0<8o!+RMJGa2a5$SUf|nxLc5KNV?xWu`DA~;*fn4rH_C~VH4#I7
zWB}O0hbwZaBzU`&%RAGkCrh>lnRnom=kyr>;oeU9FO;4bW<pR>8(}!Q49k{k!a6Vj
z7n!z{X|DZ!fkk-CU>29*APq)4y{}^+{!nZM&WtD|%rK6lCn$7ZWg%3|JGk84TAHPM
zdxcYVx0wF+azLCq1DFW-2JfBxP#hpO2DYO_v6RKQn&<sM!@89?ZG1KBwbms}p(t%0
z9HzXW$c)HCw9(q|k}&II<agQE>u{fG`S{==4@+y5!yY6aSCgF|aBEUv^}AF+dcl%P
z-Gc2{RXo+Bof!JoNue}uOyP6hk=D05+ql*6eCOp_*8|wPj*&t*huh%Q@mWE5PDWNY
zHurfg(QV(eL0$Irl_$;R7cJIxHV5B)6#44f)d(xUtP<>I@b)>pA-Q*}-x~ciA3@%+
zNIIfEGKc!6FR?AUZ9x-e04>gr&-Q(3+D(-c(ui#j_Ss)Qs?IE<Avc9J)~xZ75<#>o
z_zkcbrP#ZrF=k6Dc=5dHMl8I_m|I-v;4JKAI)P`)s_ZaMt?`a`?sIFItx?y$?Rm`W
z1qNXM2}<2aptpezUd7C~PRN9R*H|ysp`G7>HbuoBf5l=Za_LXwVhsIHnq{U4g43i`
zE-=xVZd?8dLRBlIrP(GlJwY!FmgkZ*b|pzT0)(y%(P>AoE487Cbqrup4b*KCW>tEW
z9WJ_M@u*2TjEzKGwfCfqlinspLd=v^&DX@oJh%<h&k|<fCy<J!L_z)?(M_fJ8Z>|T
zs)1UA9m4M}LN~R5O=iGaPNw#05#;1dVJX^!`iv*i@g=-#5Ap#e*$s8hNL}CDf<}S>
z@-9_s+D3Og7$WAQU17IQf1~4{rTd-@eg=6B*B1ie{x}4CVpS5$pL|pra|tm8iGf$f
zuGmrZtYen1kgvZAI{$mRn!3N=!N@a7Hgz;8Zym(~<XPT7LPh_QYTwTk=#g69R}XA1
z8AJlfLTG22iT!i$QoVI7jcr@>VrJf|gT@sGV4YKvBj6?oeynE?KadFhV>WVrvwVJR
zyAvZTU(W!-i}%#1n)x?nCFzN@6S-j?U0`>0-;lo1wt!-DSK?>ZsK{nf+A=s|lOuQ?
zyKj!WL{9o1b7E{2oxU3yr|a}kB#S<{D^FqDPJbt4O?ru<jEtkOr^}zJ2R?iMeWxq(
zz`o7$(2$AR7eDneU!BY)smf<2;d{hR)M-SzT5d(P-|HpM$JmOl$d~xzm!COTPsFm5
z`?78-<@q4iPwKc#0_j#?<qUT;l|jUPxGOVc7@|o60b?*y{z9}EWNbU^z<d1-n0}Aw
zIz1<f21OjQxM$T`Y+?y5Q(fvA##r|vjrXt7jE72(3K|*A<#s565dsmrD`Nt%r9toG
z1X8Naok-i<&cG`uta+xVM!a$GcrbKe{WGSb4V-2GDpgP6iX$|y2hR9ByB!O(?>2@N
z0n0vWi?u>s9Hd>?fj0J7=fx`nc4i`f8ViH?chc<v`4pJa6`P)X1=-U<Y-u$eV+Md2
z8aD;DDz&c?mP$fLF_%}LaeO%|mSt2|pvoBQAyFO_6L_c~?Mt!Us7j#Uwq<_vbcv4D
zh^u0vLb#QXWvIV8fjmNf3H3?%8VxVWIY^V5vW;_&EX$&>nb!;&6$rK&Dkm-J$gtW9
z!kSk~oR}#VS030sDc&SSO>BTpCko9^ERAnB_&?B>{}L)YBZo6X@jEY#x|pVJ_u)T1
zUbBZ5pno4MB2}bC`sp`1b|EnvdIu}68kuF>PVRq$)?R@CV3({Uc||p33M1${>i$PZ
ze1PJ*<|IUmxk-F^1w2ij-HS=ymX)J$;K}!+XGcqJp-*SR-iDpK;?UpBmDLEom~PS=
zcu@*h`lGxjw>2%q(b=beFVtkvJ1yNz8QQ;Iv8~jCOJD#z?)0q9$=C?5DrvoX<GLEe
z-4P+f=;~xC_In@hcc|DFp!iV3Vkty})&5qwcWQ(qQOYK##`8;>8i;eDZHD{z)#58p
zN^g3&Vg+V5E9V?fz4Xm*YCI^tEOA-FQPej;)MIXK6lz;N)L<9j9r5zn$}JX|vl|i7
z!^HNTZCQEpq98u{QdMHK%G*wR1L+X)?T+#SBO6s~O&{@!EhQyLV))m54MGG_IO=iD
z$PS1#ygl;jSrrW9y}K*xEr3U8uDiNeN*#Rn0Swbwo2=5qpD+Z)b{;BL!!C2?v%gOR
zIEh?C@3zRL?UlFH4iM@v@*8qZBzgk$*MKA_q)F9Blcq<WEoRr_-f(?X+a{#UK7a8+
z&Kc&O^N>R}gu^jpNkJCYl-j${&{If?zfz&Uce2&q|5|SZ!q2h%(*W3r^Ij81z(qsG
z5Y}2<hsNGvtmrM|q?n9@2?x^lKbRxt)<({4JNAJ9)nt@-$t|$xmMmgVFJfO27cW6y
z5wSBn!b~mh{b|tu=|FO$M}nqA4WV!f3nXkNASSo7I7yqgZouL?_vNUp-L~4TVxi8r
zr6296^<r#O9Q=)|;IQ87)C>K>=d5(3Bc&`}VmjZZ72L8p-ZQAQo1+97*}yx-&AGTP
zrrzX)_Nj?pr9107Z$N~=&idDtua$!nIX$7{dM9%}YZE6oVMVdiD<7ZD7dl(dGl0*#
zC9s%X8BZTl{yI}h)K4=3RK-}DLdVBF#dHb(hZ^6-Aek0A>+pEoRIEX2-1Q8$g3*}8
zmkDv2Te~o(_ALisU+gI`lc>2wbdx4J!#kcPPOAM*W&pcJOq1XBiUkjh=3L4_6;7W}
zANB^FTs|FT1Gy9r+>MP!PfgfH)d$CEBp6)|3`{EW@#AM^R?Uw*_K2I8%>vyU%)6J7
zSK~CSH9F<{Tf$sgH%<7};H7iBwWw>f6U^no1ck@(f0x6hw)T`=Ym0)|J^83*xI#i(
z(WS{b_i2zR8!cn852K#7FA;}WJg|u#m$<&b9L$hq+9%5&r5cCVL3JnRBUAX)TS@ty
pu~G3W$?zw3W}@wP{(0~7!-p{b_H_7PKdt_|1F-+iNjGEU-vEwM$87)r